multipath-tools: move Nimble and SGI to HPE section
PATCH 1/2 multipath-tools: move Nimble and SGI to HPE section
They were absorbed by HPE time ago.
Cc Christophe Varoqui <[email protected]>
Cc device-mapper development <[email protected]>
Signed-off-by Xose Vazquez Perez <[email protected]>
--- libmultipath/hwtable.c | 106 ++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 55 deletions(-)
libmultipath/hwtable.c +51 -55
@@ -221,6 +221,57 @@ static struct hwentry default_hw[] = { .no_path_retry = 18, .prio_name = PRIO_ALUA, }, + { + /* Nimble Storage */ + .vendor = "Nimble", + .product = "Server", + .hwhandler = "1 alua", + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .prio_name = PRIO_ALUA, + .no_path_retry = NO_PATH_RETRY_QUEUE, + }, + /* SGI */ + { + .vendor = "SGI", + .product = "TP9100", + .pgpolicy = MULTIBUS, + }, + { + /* Total Performance family */ + .vendor = "SGI", + .product = "TP9[3457]00", + .bl_product = "Universal Xport", + .pgpolicy = GROUP_BY_PRIO, + .checker_name = RDAC, + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", + .prio_name = PRIO_RDAC, + .pgfailback = -FAILBACK_IMMEDIATE, + .no_path_retry = 30, + }, + { + /* InfiniteStorage family */ + .vendor = "SGI", + .product = "IS", + .bl_product = "Universal Xport", + .pgpolicy = GROUP_BY_PRIO, + .checker_name = RDAC, + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", + .prio_name = PRIO_RDAC, + .pgfailback = -FAILBACK_IMMEDIATE, + .no_path_retry = 30, + }, + { + /* DDN */ + .vendor = "SGI", + .product = "^DD[46]A-", + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .prio_name = PRIO_ALUA, + .no_path_retry = 30, + }, /* * DataDirect Networks */
@@ -706,49 +757,6 @@ static struct hwentry default_hw[] = { .pgpolicy = GROUP_BY_SERIAL, .no_path_retry = 30, }, -/* -* SGI -*/ - { - .vendor = "SGI", - .product = "TP9100", - .pgpolicy = MULTIBUS, - }, - { - /* Total Performance family */ - .vendor = "SGI", - .product = "TP9[3457]00", - .bl_product = "Universal Xport", - .pgpolicy = GROUP_BY_PRIO, - .checker_name = RDAC, - .features = "2 pg_init_retries 50", - .hwhandler = "1 rdac", - .prio_name = PRIO_RDAC, - .pgfailback = -FAILBACK_IMMEDIATE, - .no_path_retry = 30, - }, - { - /* InfiniteStorage family */ - .vendor = "SGI", - .product = "IS", - .bl_product = "Universal Xport", - .pgpolicy = GROUP_BY_PRIO, - .checker_name = RDAC, - .features = "2 pg_init_retries 50", - .hwhandler = "1 rdac", - .prio_name = PRIO_RDAC, - .pgfailback = -FAILBACK_IMMEDIATE, - .no_path_retry = 30, - }, - { - /* DDN */ - .vendor = "SGI", - .product = "^DD[46]A-", - .pgpolicy = GROUP_BY_PRIO, - .pgfailback = -FAILBACK_IMMEDIATE, - .prio_name = PRIO_ALUA, - .no_path_retry = 30, - },/* * NEC */
@@ -1013,18 +1021,6 @@ static struct hwentry default_hw[] = { .fast_io_fail = 15, .dev_loss = 15, }, -/* -* Nimble Storage -*/ - { - .vendor = "Nimble", - .product = "Server", - .hwhandler = "1 alua", - .pgpolicy = GROUP_BY_PRIO, - .pgfailback = -FAILBACK_IMMEDIATE, - .prio_name = PRIO_ALUA, - .no_path_retry = NO_PATH_RETRY_QUEUE, - },/* * Kaminario */
Signature · 1 line
2.14.3
PATCH 2/2 multipath-tools: reformat and update comments in hwtable
Cc Christophe Varoqui <[email protected]>
Cc device-mapper development <[email protected]>
Signed-off-by Xose Vazquez Perez <[email protected]>
--- libmultipath/hwtable.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
libmultipath/hwtable.c +12 -12
@@ -72,13 +72,13 @@ .delay_wait_checks = DELAY_CHECKS_OFF, .skip_kpartx = SKIP_KPARTX_OFF, .max_sectors_kb = MAX_SECTORS_KB_UNDEF, - .ghost_delay = GHOST_DELAY_OFF + .ghost_delay = GHOST_DELAY_OFF, },#endif static struct hwentry default_hw[] = {/* -* Generic NVMe devices +* Generic NVMe * * Due to the parsing logic in find_hwe(), generic entries * have to be put on top of this list, and more specific ones
@@ -178,7 +178,7 @@ static struct hwentry default_hw[] = { .prio_name = PRIO_ALUA, }, { -/* MSA 1040, 2040 and 2050 families */ +/* MSA 1040, 1050, 2040 and 2050 families */ .vendor = "HP", .product = "MSA [12]0[45]0 SA[NS]", .pgpolicy = GROUP_BY_PRIO,
@@ -264,7 +264,7 @@ static struct hwentry default_hw[] = { .no_path_retry = 30, }, { -/* DDN */ +/* (DDN) */ .vendor = "SGI", .product = "^DD[46]A-", .pgpolicy = GROUP_BY_PRIO,
@@ -397,7 +397,7 @@ static struct hwentry default_hw[] = {* Mail : [email protected] */ { -/* USP-V, HUS VM, VSP, VSP G1000 and VSP GX00 families */ +/* USP-V, HUS VM, VSP, VSP G1X00 and VSP GX00 families */ .vendor = "(HITACHI|HP)", .product = "^OPEN-", .pgpolicy = MULTIBUS,
@@ -646,7 +646,7 @@ static struct hwentry default_hw[] = { .pgpolicy = MULTIBUS, }, { -/* DDN */ +/* (DDN) DCS9900, SONAS 2851-DR1 */ .vendor = "IBM", .product = "^(DCS9900|2851)", .pgpolicy = GROUP_BY_PRIO,
@@ -731,12 +731,12 @@ static struct hwentry default_hw[] = { .pgpolicy = MULTIBUS, .no_path_retry = 24, }, -/* -* NetApp NVMe-FC namespace devices: MULTIBUS, queueing preferred -* -* The table is searched backwards, so place this after generic NVMe -*/ { +/* +* NVMe-FC namespace devices: MULTIBUS, queueing preferred +* +* The hwtable is searched backwards, so place this after "Generic NVMe" +*/ .vendor = "NVME", .product = "^NetApp ONTAP Controller", .uid_attribute = "ID_WWN",
@@ -1158,7 +1158,7 @@ static struct hwentry default_hw[] = { .no_path_retry = 30, },/* -* Dot Hill Systems - Seagate Technology +* Seagate Technology (Dot Hill Systems) */ {/* SANnet family */
Signature · 1 line
2.14.3