b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Tue, 2 Feb 2021 21:54:37 +0100
|
|
Subject: [PATCH] multipath -w: allow removing blacklisted paths
|
|
|
|
multipath should allow removing WWIDs of paths even if they
|
|
are blacklisted.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/configure.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libmultipath/configure.c b/libmultipath/configure.c
|
|
index 3263bb01..598efe05 100644
|
|
--- a/libmultipath/configure.c
|
|
+++ b/libmultipath/configure.c
|
|
@@ -1441,7 +1441,7 @@ static int _get_refwwid(enum mpath_cmds cmd, const char *dev,
|
|
return ret;
|
|
}
|
|
}
|
|
- if (pp->udev && pp->uid_attribute &&
|
|
+ if (flags & DI_BLACKLIST &&
|
|
filter_property(conf, pp->udev, 3, pp->uid_attribute) > 0)
|
|
return PATHINFO_SKIPPED;
|
|
refwwid = pp->wwid;
|
|
@@ -1466,7 +1466,7 @@ static int _get_refwwid(enum mpath_cmds cmd, const char *dev,
|
|
refwwid = dev;
|
|
}
|
|
|
|
- if (refwwid && strlen(refwwid) &&
|
|
+ if (flags & DI_BLACKLIST && refwwid && strlen(refwwid) &&
|
|
filter_wwid(conf->blist_wwid, conf->elist_wwid, refwwid,
|
|
NULL) > 0)
|
|
return PATHINFO_SKIPPED;
|