blob: 21b8ec6b06777d3fda21a537ebd7d7a6d5198351 [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>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080020---
Brad Bishop19323692019-04-05 15:28:33 -040021 libmultipath/blacklist.c | 13 +++++--------
22 1 file changed, 5 insertions(+), 8 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080023
24diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
Brad Bishop00ab2372019-10-14 11:06:18 -040025index 00e8dbd..5204501 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080026--- a/libmultipath/blacklist.c
27+++ b/libmultipath/blacklist.c
Brad Bishop19323692019-04-05 15:28:33 -040028@@ -192,12 +192,6 @@ setup_default_blist (struct config * conf)
29 char * str;
30 int i;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080031
Brad Bishop19323692019-04-05 15:28:33 -040032- str = STRDUP("^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]");
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080033- if (!str)
34- return 1;
Brad Bishop19323692019-04-05 15:28:33 -040035- if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080036- return 1;
37-
Brad Bishop19323692019-04-05 15:28:33 -040038 str = STRDUP("^(td|hd|vd)[a-z]");
39 if (!str)
40 return 1;
Brad Bishop00ab2372019-10-14 11:06:18 -040041@@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl,
42 r = MATCH_NOTHING;
Brad Bishop19323692019-04-05 15:28:33 -040043 }
44
45- log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl);
46- return r;
47+ if (VECTOR_SIZE(conf->elist_property)) {
48+ log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl);
49+ return r;
50+ }
51+ return 0;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080052 }
53
Brad Bishop19323692019-04-05 15:28:33 -040054 static void free_ble(struct blentry *ble)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080055--
562.7.4
57