device-mapper-multipath/0121-multipath-w-allow-remo...

40 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;
--
2.17.2