diff mbox

FIX "libmultipath: hwtable: multibus for NetApp NVMe-FC"

Message ID 20180119115223.4625-1-mwilck@suse.com (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show

Commit Message

Martin Wilck Jan. 19, 2018, 11:52 a.m. UTC
There was an extra parenthesis in the patch I submitted
previously.

Fixes: "libmultipath: hwtable: multibus for NetApp NVMe-FC"
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 libmultipath/hwtable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Xose Vazquez Perez Jan. 19, 2018, 2:44 p.m. UTC | #1
On 01/19/2018 12:52 PM, Martin Wilck wrote:
> There was an extra parenthesis in the patch I submitted
> previously.

>  		.vendor	       = "NVME",
> -		.product       = "(NetApp |)ONTAP Controller)",
> +		.product       = "(NetApp |)ONTAP Controller",

Out of curiosity, what are the complete product and vendor id strings?

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
Martin Wilck Jan. 19, 2018, 3:12 p.m. UTC | #2
On Fri, 2018-01-19 at 15:44 +0100, Xose Vazquez Perez wrote:
> On 01/19/2018 12:52 PM, Martin Wilck wrote:
> > There was an extra parenthesis in the patch I submitted
> > previously.
> >  		.vendor	       = "NVME",
> > -		.product       = "(NetApp |)ONTAP Controller)",
> > +		.product       = "(NetApp |)ONTAP Controller",
> 
> Out of curiosity, what are the complete product and vendor id
> strings?
> 

All NVMe devices use "NVME" as vendor string.

The device in question uses "NetApp ONTAP Controller" for the product
(-> "model" in NVMe terms). IIUC there's older FW around that uses
"ONTAP Controller" only.

Regards,
Martin
Xose Vazquez Perez Jan. 22, 2018, 8:53 p.m. UTC | #3
On 01/19/2018 04:12 PM, Martin Wilck wrote:

>>> +		.product       = "(NetApp |)ONTAP Controller",

> The device in question uses "NetApp ONTAP Controller" for the product
> (-> "model" in NVMe terms). IIUC there's older FW around that uses
> "ONTAP Controller" only.

.product       = "ONTAP Controller" should be enough,
it's shared by both strings.

But if an exact match is desired, ^ should be added at the
beginning.


Regex can be tested with: https://eli.thegreenplace.net/2012/11/14/some-notes-on-posix-regular-expressions

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
Martin Wilck Jan. 22, 2018, 10:15 p.m. UTC | #4
On Mon, 2018-01-22 at 21:53 +0100, Xose Vazquez Perez wrote:
> On 01/19/2018 04:12 PM, Martin Wilck wrote:
> 
> > > > +		.product       = "(NetApp |)ONTAP Controller",
> > The device in question uses "NetApp ONTAP Controller" for the
> > product
> > (-> "model" in NVMe terms). IIUC there's older FW around that uses
> > "ONTAP Controller" only.
> 
> .product       = "ONTAP Controller" should be enough,
> it's shared by both strings.
>
> But if an exact match is desired, ^ should be added at the
> beginning.

Right. Thanks. I'll add '^'. I thought these were anchored :-/

Martin
diff mbox

Patch

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 4f3290123f09..918db7b0d019 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -687,7 +687,7 @@  static struct hwentry default_hw[] = {
 	 */
 	{
 		.vendor	       = "NVME",
-		.product       = "(NetApp |)ONTAP Controller)",
+		.product       = "(NetApp |)ONTAP Controller",
 		.uid_attribute = "ID_WWN",
 		.checker_name  = NONE,
 		.pgpolicy      = MULTIBUS,