32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 22 Sep 2020 16:03:31 -0500
|
|
Subject: [PATCH] libmultipath: change log level for null uid_attribute
|
|
|
|
If uid_attribute is explicitly set to an empty string, multipath should
|
|
log the uid at the default log level, since using the fallback code is
|
|
the expected behavior.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/discovery.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
|
|
index 002d3d18..77468524 100644
|
|
--- a/libmultipath/discovery.c
|
|
+++ b/libmultipath/discovery.c
|
|
@@ -2058,7 +2058,8 @@ get_uid (struct path * pp, int path_state, struct udev_device *udev,
|
|
}
|
|
if ((!udev_available || (len <= 0 && allow_fallback))
|
|
&& has_uid_fallback(pp)) {
|
|
- used_fallback = 1;
|
|
+ if (udev_available || !(udev && pp->uid_attribute))
|
|
+ used_fallback = 1;
|
|
len = uid_fallback(pp, path_state, &origin);
|
|
}
|
|
}
|
|
--
|
|
2.17.2
|
|
|