[2/2] libmultipath: hwtable: remove obsolete NVMe entries

Commit Message

Martin Wilck June 1, 2022, 8:26 p.m. UTC

From: Martin Wilck <[e-mail]>

With the previous patch, lots of specific settings for NVMe devices
can be removed, because they match the general NVMe defaults.
E-Series NVMe is removed entirely.
---
 libmultipath/hwtable.c | 27 ---------------------------
 1 file changed, 27 deletions(-)

Patch

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index e0dce84..fd4573f 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -124,7 +124,6 @@  static struct hwentry default_hw[] = {
 		/* Alletra 9000 NVMe */
 		.vendor        = "NVME",
 		.product       = "HPE Alletra",
-		.pgpolicy      = MULTIBUS,
 		.no_path_retry = NO_PATH_RETRY_QUEUE,
 	},
 	{
@@ -387,12 +386,6 @@  static struct hwentry default_hw[] = {
 		.pgfailback    = -FAILBACK_IMMEDIATE,
 		.no_path_retry = 30,
 	},
-	{
-		/* EMC PowerMax NVMe */
-		.vendor        = "NVME",
-		.product       = "^EMC PowerMax_",
-		.pgpolicy      = MULTIBUS,
-	},
 	{
 		/* PowerStore */
 		.vendor        = "DellEMC",
@@ -408,9 +401,6 @@  static struct hwentry default_hw[] = {
 		/* PowerStore NVMe */
 		.vendor        = ".*",
 		.product       = "dellemc-powerstore",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.prio_name     = PRIO_ANA,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
 		.no_path_retry = 3,
 	},
 	{
@@ -482,9 +472,6 @@  static struct hwentry default_hw[] = {
 		/* ETERNUS AB/HB NVMe */
 		.vendor        = "NVME",
 		.product       = "Fujitsu ETERNUS AB/HB Series",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.prio_name     = PRIO_ANA,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
 		.no_path_retry = 30,
 	},
 	/*
@@ -703,7 +690,6 @@  static struct hwentry default_hw[] = {
 		/* FlashSystem(Storwize/SVC) NVMe */
 		.vendor        = "NVME",
 		.product       = "IBM[ ]+2145",
-		.pgpolicy      = MULTIBUS,
 		.no_path_retry = NO_PATH_RETRY_QUEUE,
 	},
 	{
@@ -763,7 +749,6 @@  static struct hwentry default_hw[] = {
 		/* FlashSystem(RamSan) NVMe */
 		.vendor        = "NVMe",
 		.product       = "FlashSystem",
-		.pgpolicy      = MULTIBUS,
 		.no_path_retry = NO_PATH_RETRY_FAIL,
 	},
 	{
@@ -875,18 +860,8 @@  static struct hwentry default_hw[] = {
 		/* ONTAP NVMe */
 		.vendor        = "NVME",
 		.product       = "^NetApp ONTAP Controller",
-		.pgpolicy      = MULTIBUS,
 		.no_path_retry = NO_PATH_RETRY_QUEUE,
 	},
-	{
-		/* E-Series NVMe */
-		.vendor        = "NVME",
-		.product       = "NetApp E-Series",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.prio_name     = PRIO_ANA,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.no_path_retry = 30,
-	},
 	/*
 	 * NEC
 	 */
@@ -1130,7 +1105,6 @@  static struct hwentry default_hw[] = {
 		/* FlashArray NVMe */
 		.vendor        = "NVME",
 		.product       = "Pure Storage FlashArray",
-		.pgpolicy      = MULTIBUS,
 		.no_path_retry = 10,
 	},
 	/*
@@ -1150,7 +1124,6 @@  static struct hwentry default_hw[] = {
 		/* OceanStor NVMe */
 		.vendor        = "NVME",
 		.product       = "Huawei-XSG1",
-		.pgpolicy      = MULTIBUS,
 		.checker_name  = DIRECTIO,
 		.no_path_retry = 12,
 	},