Skip to contentSkip to conversation

multipath: add allow users to set revision in multipath.conf

PATCH New Benjamin Marzinski 1 participant 1 message Dec 20, 2010 Device mapper

lore
Share & tools
lore

Benjamin Marzinski

author maintainer
#0 lore raw

PATCH 1/1 multipath: add allow users to set revision in multipath.conf

Since multipath is able to select hardware entries based on the revision parameter, users should be allowed to set it in their devices configurations.

---
 libmultipath/dict.c        |   28 ++++++++++++++++++++++++++++
 multipath/multipath.conf.5 |    5 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
libmultipath/dict.c +28 -0
Index: multipath-tools-101104/libmultipath/dict.c
===================================================================
@@ -730,6 +730,22 @@ product_handler(vector strvec)
 }
 
 static int
+revision_handler(vector strvec)
+{
+	struct hwentry * hwe = VECTOR_LAST_SLOT(conf->hwtable);
+
+	if (!hwe)
+		return 1;
+
+	hwe->revision = set_value(strvec);
+
+	if (!hwe->revision)
+		return 1;
+
+	return 0;
+}
+
+static int
 bl_product_handler(vector strvec)
 {
 	struct hwentry * hwe = VECTOR_LAST_SLOT(conf->hwtable);
@@ -1617,6 +1633,17 @@ snprint_hw_product (char * buff, int len
 }
 
 static int
+snprint_hw_revision (char * buff, int len, void * data)
+{
+	struct hwentry * hwe = (struct hwentry *)data;
+
+	if (!hwe->revision)
+		return 0;
+
+	return snprintf(buff, len, "\"%s\"", hwe->revision);
+}
+
+static int
 snprint_hw_bl_product (char * buff, int len, void * data)
 {
 	struct hwentry * hwe = (struct hwentry *)data;
@@ -2212,6 +2239,7 @@ init_keywords(void)
 	install_sublevel();
 	install_keyword("vendor", &vendor_handler, &snprint_hw_vendor);
 	install_keyword("product", &product_handler, &snprint_hw_product);
+	install_keyword("revision", &revision_handler, &snprint_hw_revision);
 	install_keyword("product_blacklist", &bl_product_handler, &snprint_hw_bl_product);
 	install_keyword("path_grouping_policy", &hw_pgpolicy_handler, &snprint_hw_path_grouping_policy);
 	install_keyword("getuid_callout", &hw_getuid_callout_handler, &snprint_hw_getuid_callout);
multipath/multipath.conf.5 +4 -1
Index: multipath-tools-101104/multipath/multipath.conf.5
===================================================================
@@ -406,8 +406,11 @@ subsection recognizes the following attr
 .B product
 (Mandatory) Product identifier
 .TP
+.B revision
+(Optional) Revision identfier
+.TP
 .B product_blacklist
-Product strings to blacklist for this vendor
+(Optional) Product strings to blacklist for this vendor
 .TP
 .B hardware_handler
 (Optional) The hardware handler to use for this device type.