|
 |
f20720 |
---
|
|
|
f20720 |
libmultipath/discovery.c | 15 +++++++++++----
|
|
|
f20720 |
multipathd/main.c | 10 ++++++++++
|
|
|
f20720 |
2 files changed, 21 insertions(+), 4 deletions(-)
|
|
|
f20720 |
|
|
|
f20720 |
Index: multipath-tools-130222/libmultipath/discovery.c
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/libmultipath/discovery.c
|
|
|
f20720 |
+++ multipath-tools-130222/libmultipath/discovery.c
|
|
|
f20720 |
@@ -84,10 +84,6 @@ path_discover (vector pathvec, struct co
|
|
|
f20720 |
if (!devname)
|
|
|
f20720 |
return PATHINFO_FAILED;
|
|
|
f20720 |
|
|
|
f20720 |
- if (filter_devnode(conf->blist_devnode, conf->elist_devnode,
|
|
|
f20720 |
- (char *)devname) > 0)
|
|
|
f20720 |
- return PATHINFO_SKIPPED;
|
|
|
f20720 |
-
|
|
|
f20720 |
pp = find_path_by_dev(pathvec, (char *)devname);
|
|
|
f20720 |
if (!pp) {
|
|
|
f20720 |
return store_pathinfo(pathvec, conf->hwtable,
|
|
|
f20720 |
@@ -1286,6 +1282,17 @@ pathinfo (struct path *pp, vector hwtabl
|
|
|
f20720 |
if (!pp)
|
|
|
f20720 |
return PATHINFO_FAILED;
|
|
|
f20720 |
|
|
|
f20720 |
+ /*
|
|
|
f20720 |
+ * For behavior backward-compatibility with multipathd,
|
|
|
f20720 |
+ * the blacklisting by filter_devnode() is not
|
|
|
f20720 |
+ * limited by DI_BLACKLIST and occurs before this debug
|
|
|
f20720 |
+ * message with the mask value.
|
|
|
f20720 |
+ */
|
|
|
f20720 |
+ if (filter_devnode(conf->blist_devnode,
|
|
|
f20720 |
+ conf->elist_devnode,
|
|
|
f20720 |
+ pp->dev) > 0)
|
|
|
f20720 |
+ return PATHINFO_SKIPPED;
|
|
|
f20720 |
+
|
|
|
f20720 |
condlog(3, "%s: mask = 0x%x", pp->dev, mask);
|
|
|
f20720 |
|
|
|
f20720 |
/*
|
|
|
f20720 |
Index: multipath-tools-130222/multipathd/main.c
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/multipathd/main.c
|
|
|
f20720 |
+++ multipath-tools-130222/multipathd/main.c
|
|
|
f20720 |
@@ -776,6 +776,16 @@ uev_update_path (struct uevent *uev, str
|
|
|
f20720 |
|
|
|
f20720 |
pp = find_path_by_dev(vecs->pathvec, uev->kernel);
|
|
|
f20720 |
if (!pp) {
|
|
|
f20720 |
+ /* If the path is blacklisted, print a debug/non-default verbosity message. */
|
|
|
f20720 |
+ if (uev->udev) {
|
|
|
f20720 |
+ int flag = DI_SYSFS | DI_WWID;
|
|
|
f20720 |
+
|
|
|
f20720 |
+ if (store_pathinfo(NULL, conf->hwtable, uev->udev, flag, NULL) == PATHINFO_SKIPPED) {
|
|
|
f20720 |
+ condlog(3, "%s: spurious uevent, path is blacklisted", uev->kernel);
|
|
|
f20720 |
+ return 0;
|
|
|
f20720 |
+ }
|
|
|
f20720 |
+ }
|
|
|
f20720 |
+
|
|
|
f20720 |
condlog(0, "%s: spurious uevent, path not found",
|
|
|
f20720 |
uev->kernel);
|
|
|
f20720 |
return 1;
|