libmultipath: Add default hardware table entry for IBM DCS3860 with product ID 1813.

Commit Message

Merla, ShivaKrishna Dec. 4, 2014, 4:22 p.m. UTC

Adding default hw entry for IBM DCS3860 storage array with product id
1813 and merging similar hw entries together.

Signed-off-by: Shiva Krishna Merla <[e-mail]>
---
 libmultipath/hwtable.c | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

--

--
dm-devel mailing list
[e-mail]
https://www.redhat.com/mailman/listinfo/dm-devel

Patch

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index a9dde7f..927d8ca 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -445,39 +445,9 @@  static struct hwentry default_hw[] = {
 		.prio_args     = NULL,
 	},
 	{
-	    /* IBM DS4700 */
+		/* IBM DCS3860 / DS4700 / DS4800 / DS5000 */
 		.vendor        = "IBM",
-		.product       = "^1814",
-		.bl_product    = "Universal Xport",
-		.features      = DEFAULT_FEATURES,
-		.hwhandler     = "1 rdac",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = NO_PATH_RETRY_QUEUE,
-		.checker_name  = RDAC,
-		.prio_name     = PRIO_RDAC,
-		.prio_args     = NULL,
-	},
-	{
-	    /* IBM DS4800 */
-		.vendor        = "IBM",
-		.product       = "^1815",
-		.bl_product    = "Universal Xport",
-		.features      = DEFAULT_FEATURES,
-		.hwhandler     = "1 rdac",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = NO_PATH_RETRY_QUEUE,
-		.checker_name  = RDAC,
-		.prio_name     = PRIO_RDAC,
-		.prio_args     = NULL,
-	},
-	{
-	    /* IBM DS5000 */
-		.vendor        = "IBM",
-		.product       = "^1818",
+		.product       = "^1813|^1814|^1815|^1818",
 		.bl_product    = "Universal Xport",
 		.features      = DEFAULT_FEATURES,
 		.hwhandler     = "1 rdac",