From 2f80aed70e6e6b23014abf47178a936b13b01cad Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 13 Apr 2016 17:29:59 -0400 Subject: [PATCH] storage: mpath: Don't error on target_type=NULL We use device-mapper to enumerate all dm devices, and filter out the list of multipath devices by checking the target_type string name. The code however cancels all scanning if we encounter target_type=NULL I don't know how to reproduce that situation, but a user was hitting it in their setup, and inspecting the lvm2/device-mapper code shows many places where !target_type is explicitly ignored and processing continues on to the next device. So I think we should do the same https://bugzilla.redhat.com/show_bug.cgi?id=1069317 (cherry picked from commit 8f8c0feb113420625f15b7f1e17bfd719c977eeb) --- src/storage/storage_backend_mpath.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index b5b4bb6587..bf1b1abe03 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -114,12 +114,7 @@ virStorageBackendIsMultipath(const char *dev_name) dm_get_next_target(dmt, next, &start, &length, &target_type, ¶ms); - if (target_type == NULL) { - ret = -1; - goto out; - } - - if (STREQ(target_type, "multipath")) + if (STREQ_NULLABLE(target_type, "multipath")) ret = 1; out: