[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[dm-devel] [PATCH] multipath: make sure all the hwe attributes get merged



Not all of the hwe attributes were getting merged.  Also,
multipathd show config was putting an extra set of quotes around the entries
in the devices section.

Signed-off-by: Benjamin Marzinski <bmarzins redhat com>
---
 libmultipath/config.c |    4 ++++
 libmultipath/print.c  |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

Index: multipath-tools-110916/libmultipath/config.c
===================================================================
--- multipath-tools-110916.orig/libmultipath/config.c
+++ multipath-tools-110916/libmultipath/config.c
@@ -320,6 +320,10 @@ merge_hwe (struct hwentry * dst, struct
 	merge_num(no_path_retry);
 	merge_num(minio);
 	merge_num(minio_rq);
+	merge_num(pg_timeout);
+	merge_num(flush_on_last_del);
+	merge_num(fast_io_fail);
+	merge_num(dev_loss);
 
 	return 0;
 }
Index: multipath-tools-110916/libmultipath/print.c
===================================================================
--- multipath-tools-110916.orig/libmultipath/print.c
+++ multipath-tools-110916/libmultipath/print.c
@@ -860,7 +860,7 @@ snprint_hwentry (char * buff, int len, s
 	if (fwd > len)
 		return len;
 	iterate_sub_keywords(rootkw, kw, i) {
-		fwd += snprint_keyword(buff + fwd, len - fwd, "\t\t%k \"%v\"\n",
+		fwd += snprint_keyword(buff + fwd, len - fwd, "\t\t%k %v\n",
 				kw, hwe);
 		if (fwd > len)
 			return len;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]