multipath: better check for daemon mode

PATCH RESEND New Benjamin Marzinski 1 participant 1 message Oct 11, 2011 Device mapper

Share & tools

Benjamin Marzinski

author maintainer

2011-10-11 03:16 UTC #0 lore raw

PATCH RESEND 1/1 multipath: better check for daemon mode

With the existing check, if a multipath device gets created with a blacklisted path (because, for instance, the path was unblacklisted, but multipathd was not reconfigured), multipathd will crash. This is because multipathd will add the path when it adds the multipath device, but it won't have all the necessary information to use the path. The new check makes sure multipathd won't add blacklisted paths, simply because they are part of a multipath device.

Signed-off-by Benjamin Marzinski <[email protected]>

---
 libmultipath/dmparser.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

libmultipath/dmparser.c +2 -1

Index: multipath-tools-110713/libmultipath/dmparser.c
===================================================================
@@ -13,6 +13,7 @@
 #include "structs.h"
 #include "util.h"
 #include "debug.h"
+#include "config.h"
 
 #define WORD_SIZE 64

@@ -330,7 +331,7 @@ disassemble_map (vector pathvec, char * 
 				strncpy(pp->dev_t, word, BLK_DEV_SIZE);
 
 				/* Only call this in multipath client mode */
-				if (!mpp->waiter && store_path(pathvec, pp))
+				if (!conf->daemon && store_path(pathvec, pp))
 					goto out1;
 			}
 			FREE(word);