summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2019-02-05 10:15:40 -0600
committerDavid Teigland <teigland@redhat.com>2019-02-05 10:20:24 -0600
commit57cde6063f3073e73542c5f7f59d0269ad9b703b (patch)
tree2f490110e7cde24965bdf414e7673ad4eed4a200
parentd0cb672466437161055ac084a5c1523b0eec1bf5 (diff)
downloadlvm2-2018-06-01-stable.tar.gz
apply obtain_device_list_from_udev to all libudev usage2018-06-01-stable
udev_dev_is_md_component and udev_dev_is_mpath_component are not used for obtaining the device list, but they still use libudev for device info. When there are problems with udev, these functions can get stuck. So, use the existing obtain_device_list_from_udev config setting to also control whether these "is component" functions are used, which gives us a way to avoid using libudev entirely when it's causing problems.
-rw-r--r--lib/device/dev-type.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
index 33ebb73b2..e909c0f06 100644
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -1063,6 +1063,9 @@ int udev_dev_is_mpath_component(struct device *dev)
const char *value;
int ret = 0;
+ if (!obtain_device_list_from_udev())
+ return 0;
+
if (!(udev_device = _udev_get_dev(dev)))
return 0;
@@ -1092,6 +1095,9 @@ int udev_dev_is_md_component(struct device *dev)
const char *value;
int ret = 0;
+ if (!obtain_device_list_from_udev())
+ return 0;
+
if (!(udev_device = _udev_get_dev(dev)))
return 0;