blob: 4b24bd2d3539e93f9bb09e74df17866843592fb8 [file] [log] [blame]
Patrick Williamsb58112e2024-03-07 11:16:36 -06001From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 1 Mar 2024 10:34:06 +0800
4Subject: [PATCH 02/12] RH: Remove the property blacklist exception 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
Andrew Geissler517393d2023-01-13 08:55:19 -060018[OP: Rebase to 0.9.3]
19Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Patrick Williams520786c2023-06-25 16:20:36 -050020
Patrick Williamsb58112e2024-03-07 11:16:36 -060021Rebase to 0.9.8
22Signed-off-by: Changqing Li <changqing.li@windriver.com>
Patrick Williams03514f12024-04-05 07:04:11 -050023
24Upstream-Status: Pending
Patrick Williamsb58112e2024-03-07 11:16:36 -060025---
26 libmultipath/blacklist.c | 16 +++++-----------
27 1 file changed, 5 insertions(+), 11 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080028
29diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
Patrick Williamsb58112e2024-03-07 11:16:36 -060030index 75100b20..4fdaca76 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080031--- a/libmultipath/blacklist.c
32+++ b/libmultipath/blacklist.c
Patrick Williamsb58112e2024-03-07 11:16:36 -060033@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf)
Andrew Geissler517393d2023-01-13 08:55:19 -060034 struct hwentry *hwe;
Brad Bishop19323692019-04-05 15:28:33 -040035 int i;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080036
Patrick Williamsb58112e2024-03-07 11:16:36 -060037- if (nvme_multipath_enabled()) {
38- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z])",
39- ORIGIN_DEFAULT))
40- return 1;
41- } else {
42- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])",
43- ORIGIN_DEFAULT))
44- return 1;
45- }
Andrew Geissler517393d2023-01-13 08:55:19 -060046 if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT))
Brad Bishop19323692019-04-05 15:28:33 -040047 return 1;
Andrew Geissler517393d2023-01-13 08:55:19 -060048
Patrick Williamsb58112e2024-03-07 11:16:36 -060049@@ -464,8 +455,11 @@ filter_property(const struct config *conf, struct udev_device *udev,
Brad Bishop00ab2372019-10-14 11:06:18 -040050 r = MATCH_NOTHING;
Brad Bishop19323692019-04-05 15:28:33 -040051 }
52
53- log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl);
54- return r;
55+ if (VECTOR_SIZE(conf->elist_property)) {
56+ log_filter(devname, NULL, NULL, NULL, env, NULL, r, lvl);
57+ return r;
58+ }
59+ return 0;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080060 }
61
Brad Bishop19323692019-04-05 15:28:33 -040062 static void free_ble(struct blentry *ble)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080063--
Patrick Williamsb58112e2024-03-07 11:16:36 -0600642.25.1
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080065