File 0001-libmultipath-fall-back-to-search-paths-by-... of Package multipath-tools

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-libmultipath-fall-back-to-search-paths-by-devt.patch of Package multipath-tools (Revision 0a4e5a8938ddc71243bef58ebdcbd8da)

Currently displaying revision 0a4e5a8938ddc71243bef58ebdcbd8da , Show latest

From 9f5adb0cc92d47de4824f1534fe23742320bfc6b Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 26 Aug 2016 15:07:33 +0200
Subject: [PATCH] libmultipath: fall back to search paths by devt

When removing path the device might already be gone from sysfs,
so we cannot lookup the device name. However, we still should
have the path vector available, so we should be trying to look
it up by using the device number.

References: bsc#995645

Signed-off-by: Hannes Reinecke <hare@suse.com>
---
 libmultipath/discovery.c | 11 +++++++++--
 libmultipath/dmparser.c  | 11 +++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 1fb4db4..84c743d 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -126,8 +126,15 @@ path_discover (vector pathvec, struct config * conf,
 
 	pp = find_path_by_dev(pathvec, (char *)devname);
 	if (!pp) {
-		return store_pathinfo(pathvec, conf,
-				      udevice, flag, NULL);
+		char devt[BLK_DEV_SIZE];
+		dev_t devnum = udev_device_get_devnum(udevice);
+
+		snprintf(devt, BLK_DEV_SIZE, "%d:%d",
+			 major(devnum), minor(devnum));
+		pp = find_path_by_devt(pathvec, devt);
+		if (!pp)
+			return store_pathinfo(pathvec, conf,
+					      udevice, flag, NULL);
 	}
 	return pathinfo(pp, conf, flag);
 }
diff --git a/libmultipath/dmparser.c b/libmultipath/dmparser.c
index 9e79ecd..66d146a 100644
--- a/libmultipath/dmparser.c
+++ b/libmultipath/dmparser.c
@@ -331,12 +331,15 @@ disassemble_map (vector pathvec, char * params, struct multipath * mpp,
 			if (devt2devname(devname, FILE_NAME_SIZE, word)) {
 				condlog(2, "%s: cannot find block device",
 					word);
-				FREE(word);
-				continue;
+				devname[0] = '\0';
 			}
 
-			if (pathvec)
-				pp = find_path_by_dev(pathvec, devname);
+			if (pathvec) {
+				if (strlen(devname))
+					pp = find_path_by_dev(pathvec, devname);
+				else
+					pp = find_path_by_devt(pathvec, word);
+			}
 
 			if (!pp) {
 				pp = alloc_path();
-- 
2.6.6

Places

File 0001-libmultipath-fall-back-to-search-paths-by-devt.patch of Package multipath-tools (Revision 0a4e5a8938ddc71243bef58ebdcbd8da)

Places