[PATCH] multipath-tools: Remove NetApp IBM Nseries code

[PATCH] multipath-tools: Remove NetApp IBM Nseries code

[Martin George]

Remove the NetApp IBM Nseries code due to the following reasons:

1) The NetApp IBM Nseries product is obsolete now.

2) Even earlier, the NetApp IBM Nseries product line never used a
VID/PID of "IBM" & "Nseries" respectively. Instead, it always
used the same VID/PID of "NETAPP" & "LUN" itself, similar to the
ONTAP product line. So this piece of code was redundant from the
beginning itself.

Signed-off-by: Martin George <marting@netapp.com>
---
 libmultipath/hwtable.c     | 14 --------------
 multipath/multipath.conf.5 |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index a89ea87..140e802 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -770,20 +770,6 @@ static struct hwentry default_hw[] = {
 		.retain_hwhandler = RETAIN_HWHANDLER_ON,
 		.detect_prio   = DETECT_PRIO_ON,
 	},
-	{
-		/* IBM NSeries */
-		.vendor        = "IBM",
-		.product       = "Nseries.*",
-		.features      = "1 queue_if_no_path",
-		.hwhandler     = DEFAULT_HWHANDLER,
-		.pgpolicy      = GROUP_BY_PRIO,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = NO_PATH_RETRY_UNDEF,
-		.minio         = 128,
-		.prio_name     = PRIO_ONTAP,
-		.prio_args     = NULL,
-	},
 	/*
 	 * NEXENTA
 	 *
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
index 709ab3c..0b4d366 100644
--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
@@ -224,7 +224,7 @@ accepts the optional prio_arg \fIexclusive_pref_bit\fR.
 .TP
 .I ontap
 (Hardware-dependent)
-Generate the path priority for NetApp ONTAP class and OEM arrays as IBM NSeries.
+Generate the path priority for NetApp ONTAP class arrays.
 .TP
 .I rdac
 (Hardware-dependent)
-- 
1.9.1

Re: [PATCH] multipath-tools: Remove NetApp IBM Nseries code

[Xose Vazquez Perez]

On 07/10/2016 10:25 PM, Martin George wrote:

> Remove the NetApp IBM Nseries code due to the following reasons:
> 
> 1) The NetApp IBM Nseries product is obsolete now.

This really doesn't matter.

> 2) Even earlier, the NetApp IBM Nseries product line never used a
> VID/PID of "IBM" & "Nseries" respectively. Instead, it always
> used the same VID/PID of "NETAPP" & "LUN" itself, similar to the
> ONTAP product line. So this piece of code was redundant from the
> beginning itself.

OK, thank you for the notice.

> Signed-off-by: Martin George <marting@netapp.com>
> ---
>  libmultipath/hwtable.c     | 14 --------------
>  multipath/multipath.conf.5 |  2 +-
>  2 files changed, 1 insertion(+), 15 deletions(-)
> 
> diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
> index a89ea87..140e802 100644
> --- a/libmultipath/hwtable.c
> +++ b/libmultipath/hwtable.c
> @@ -770,20 +770,6 @@ static struct hwentry default_hw[] = {
>  		.retain_hwhandler = RETAIN_HWHANDLER_ON,
>  		.detect_prio   = DETECT_PRIO_ON,
>  	},
> -	{
> -		/* IBM NSeries */
> -		.vendor        = "IBM",
> -		.product       = "Nseries.*",
> -		.features      = "1 queue_if_no_path",
> -		.hwhandler     = DEFAULT_HWHANDLER,
> -		.pgpolicy      = GROUP_BY_PRIO,
> -		.pgfailback    = -FAILBACK_IMMEDIATE,
> -		.rr_weight     = RR_WEIGHT_NONE,
> -		.no_path_retry = NO_PATH_RETRY_UNDEF,
> -		.minio         = 128,
> -		.prio_name     = PRIO_ONTAP,
> -		.prio_args     = NULL,
> -	},
>  	/*
>  	 * NEXENTA
>  	 *

> diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
> index 709ab3c..0b4d366 100644
> --- a/multipath/multipath.conf.5
> +++ b/multipath/multipath.conf.5
> @@ -224,7 +224,7 @@ accepts the optional prio_arg \fIexclusive_pref_bit\fR.
>  .TP
>  .I ontap
>  (Hardware-dependent)
> -Generate the path priority for NetApp ONTAP class and OEM arrays as IBM NSeries.
> +Generate the path priority for NetApp ONTAP class arrays.
>  .TP
>  .I rdac
>  (Hardware-dependent)

But I would like to preserve that text in the man page.

Re: [PATCH] multipath-tools: Remove NetApp IBM Nseries code

[Martin George]

On 7/12/2016 7:30 AM, Xose Vazquez Perez wrote:
>
>> diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
>> index 709ab3c..0b4d366 100644
>> --- a/multipath/multipath.conf.5
>> +++ b/multipath/multipath.conf.5
>> @@ -224,7 +224,7 @@ accepts the optional prio_arg \fIexclusive_pref_bit\fR.
>>   .TP
>>   .I ontap
>>   (Hardware-dependent)
>> -Generate the path priority for NetApp ONTAP class and OEM arrays as IBM NSeries.
>> +Generate the path priority for NetApp ONTAP class arrays.
>>   .TP
>>   .I rdac
>>   (Hardware-dependent)
>
> But I would like to preserve that text in the man page.
>

Ok, fair enough. So only the hwtable.c needs to be updated here for this 
IBM Nseries change.

-Martin