[dm-devel] [PATCH 1/2] Remove duplicate hwtable entry for XtremIO

[Hannes Reinecke]

Commit b47e607408e1edce3a03744b4aefa292723c7fc6 introduced a new
hwtable entry for EMC XtremIO instead of updating the existing
one.

Signed-off-by: Hannes Reinecke <hare at suse.de>
---
 libmultipath/hwtable.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 13611fe..fa4b20f 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -294,11 +294,11 @@ static struct hwentry default_hw[] = {
 		.product       = "XtremApp",
 		.features      = DEFAULT_FEATURES,
 		.hwhandler     = DEFAULT_HWHANDLER,
+		.selector      = "queue-length 0",
 		.pgpolicy      = MULTIBUS,
 		.pgfailback    = FAILBACK_UNDEF,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = 5,
 		.checker_name  = TUR,
+		.fast_io_fail  = 5,
 		.prio_name     = DEFAULT_PRIO,
 		.prio_args     = NULL,
 	},
@@ -1166,19 +1166,6 @@ static struct hwentry default_hw[] = {
 		.prio_name     = PRIO_ALUA,
 		.prio_args     = NULL,
 	},
-	{
-		.vendor        = "XtremIO",
-		.product       = "XtremApp",
-		.features      = DEFAULT_FEATURES,
-		.hwhandler     = DEFAULT_HWHANDLER,
-		.selector      = "queue-length 0",
-		.pgpolicy      = MULTIBUS,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.checker_name  = DIRECTIO,
-		.fast_io_fail  = 15,
-		.prio_name     = DEFAULT_PRIO,
-		.prio_args     = NULL,
-	},
 	/*
 	 * EOL
 	 */
-- 
1.8.4.5