blob: 0eff18b853139dd2cadcff93bd46a3268a28ae65 [file] [log] [blame]
Brad Bishop00ab2372019-10-14 11:06:18 -04001From 0000000000000000000000000000000000000000 Mon Sep 17
200:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul
32014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist
4exception builtin
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08005
6Multipath set the default property blacklist exceptions to
7(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal
8devices. These devices may never have multiple paths, but it is nice
9to be able to set multipath up on them all the same. This patch simply
10removes the default, and makes it so that if no property
11blacklist_exception is given, then devices aren't failed for not matching
12it.
13
14Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Brad Bishop19323692019-04-05 15:28:33 -040015
16Upsteam-Status: Pending
17
Brad Bishop00ab2372019-10-14 11:06:18 -040018Update patch to 0.8.2
Brad Bishop19323692019-04-05 15:28:33 -040019Signed-off-by: Changqing Li <changqing.li@windriver.com>
Andrew Geissler517393d2023-01-13 08:55:19 -060020[OP: Rebase to 0.9.3]
21Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022---
Andrew Geissler517393d2023-01-13 08:55:19 -060023 libmultipath/blacklist.c | 10 +++++-----
24 1 file changed, 5 insertions(+), 5 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080025
26diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
Andrew Geissler517393d2023-01-13 08:55:19 -060027index 8d15d2ea..820b0d68 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080028--- a/libmultipath/blacklist.c
29+++ b/libmultipath/blacklist.c
Andrew Geissler517393d2023-01-13 08:55:19 -060030@@ -198,9 +198,6 @@ setup_default_blist (struct config * conf)
31 struct hwentry *hwe;
Brad Bishop19323692019-04-05 15:28:33 -040032 int i;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080033
Andrew Geissler517393d2023-01-13 08:55:19 -060034- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", ORIGIN_DEFAULT))
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080035- return 1;
36-
Andrew Geissler517393d2023-01-13 08:55:19 -060037 if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT))
Brad Bishop19323692019-04-05 15:28:33 -040038 return 1;
Andrew Geissler517393d2023-01-13 08:55:19 -060039
40@@ -435,8 +432,11 @@ filter_property(const struct config *conf, struct udev_device *udev,
Brad Bishop00ab2372019-10-14 11:06:18 -040041 r = MATCH_NOTHING;
Brad Bishop19323692019-04-05 15:28:33 -040042 }
43
44- log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl);
45- return r;
46+ if (VECTOR_SIZE(conf->elist_property)) {
47+ log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl);
48+ return r;
49+ }
50+ return 0;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080051 }
52
Brad Bishop19323692019-04-05 15:28:33 -040053 static void free_ble(struct blentry *ble)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080054--
Andrew Geissler517393d2023-01-13 08:55:19 -0600552.38.1
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080056