Brad Bishop | 00ab237 | 2019-10-14 11:06:18 -0400 | [diff] [blame] | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 |
| 2 | 00:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul |
| 3 | 2014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist |
| 4 | exception builtin |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 5 | |
| 6 | Multipath set the default property blacklist exceptions to |
| 7 | (ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal |
| 8 | devices. These devices may never have multiple paths, but it is nice |
| 9 | to be able to set multipath up on them all the same. This patch simply |
| 10 | removes the default, and makes it so that if no property |
| 11 | blacklist_exception is given, then devices aren't failed for not matching |
| 12 | it. |
| 13 | |
| 14 | Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 15 | |
| 16 | Upsteam-Status: Pending |
| 17 | |
Brad Bishop | 00ab237 | 2019-10-14 11:06:18 -0400 | [diff] [blame] | 18 | Update patch to 0.8.2 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 19 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 20 | --- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 21 | libmultipath/blacklist.c | 13 +++++-------- |
| 22 | 1 file changed, 5 insertions(+), 8 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 23 | |
| 24 | diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c |
Brad Bishop | 00ab237 | 2019-10-14 11:06:18 -0400 | [diff] [blame] | 25 | index 00e8dbd..5204501 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | --- a/libmultipath/blacklist.c |
| 27 | +++ b/libmultipath/blacklist.c |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 28 | @@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) |
| 29 | char * str; |
| 30 | int i; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 31 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 32 | - str = STRDUP("^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]"); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 33 | - if (!str) |
| 34 | - return 1; |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 35 | - if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 36 | - return 1; |
| 37 | - |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 38 | str = STRDUP("^(td|hd|vd)[a-z]"); |
| 39 | if (!str) |
| 40 | return 1; |
Brad Bishop | 00ab237 | 2019-10-14 11:06:18 -0400 | [diff] [blame] | 41 | @@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl, |
| 42 | r = MATCH_NOTHING; |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 43 | } |
| 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 52 | } |
| 53 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 54 | static void free_ble(struct blentry *ble) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 55 | -- |
| 56 | 2.7.4 |
| 57 | |