All of lore.kernel.org
 help / color / mirror / Atom feed
From: Benjamin Marzinski <bmarzins@redhat.com>
To: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>,
	Martin Wilck <Martin.Wilck@suse.com>
Subject: [dm-devel] [PATCH 2/4] libmultipath: fix priorities in parse_vpd_pg83
Date: Thu, 25 Mar 2021 19:52:44 -0500	[thread overview]
Message-ID: <1616719966-10221-3-git-send-email-bmarzins@redhat.com> (raw)
In-Reply-To: <1616719966-10221-1-git-send-email-bmarzins@redhat.com>

The priorities for the EUI-64 (0x02) and NAME (0x08) scsi identifiers in
parse_vpd_pg83() don't match their priorities in 55-scsi-sg3_id.rules.
Switch them so that they match.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
---
 libmultipath/discovery.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 5727f7a6..f8044141 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -1152,19 +1152,19 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
 				vpd = d;
 			}
 			break;
-		case 0x8:
-			/* SCSI Name: Prio 4 */
-			if (memcmp(d + 4, "eui.", 4) &&
-			    memcmp(d + 4, "naa.", 4) &&
-			    memcmp(d + 4, "iqn.", 4))
-				break;
+		case 0x2:
+			/* EUI-64: Prio 4 */
 			if (prio < 4) {
 				prio = 4;
 				vpd = d;
 			}
 			break;
-		case 0x2:
-			/* EUI-64: Prio 3 */
+		case 0x8:
+			/* SCSI Name: Prio 3 */
+			if (memcmp(d + 4, "eui.", 4) &&
+			    memcmp(d + 4, "naa.", 4) &&
+			    memcmp(d + 4, "iqn.", 4))
+				break;
 			if (prio < 3) {
 				prio = 3;
 				vpd = d;
-- 
2.17.2

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


  parent reply	other threads:[~2021-03-26  0:55 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-26  0:52 [dm-devel] [PATCH 0/4] Fixups to my wwid recheck patch Benjamin Marzinski
2021-03-26  0:52 ` [dm-devel] [PATCH 1/4] libmultipath: avoid infinite loop with bad vpd page 83 identifier Benjamin Marzinski
2021-03-26 16:49   ` Martin Wilck
2021-03-26  0:52 ` Benjamin Marzinski [this message]
2021-03-26 17:12   ` [dm-devel] [PATCH 2/4] libmultipath: fix priorities in parse_vpd_pg83 Martin Wilck
2021-03-27  2:18     ` Benjamin Marzinski
2021-03-29  8:44       ` Martin Wilck
2021-03-29 18:20         ` Benjamin Marzinski
2021-03-29 19:08           ` Martin Wilck
2021-03-29 20:09             ` Benjamin Marzinski
2021-03-29  8:47   ` Martin Wilck
2021-03-26  0:52 ` [dm-devel] [PATCH 3/4] multipathd: improve getting parent udevice in rescan_path Benjamin Marzinski
2021-03-26 17:15   ` Martin Wilck
2021-03-26  0:52 ` [dm-devel] [PATCH 4/4] multipathd: don't trigger uevent for partitions on wwid change Benjamin Marzinski
2021-03-26 17:16   ` Martin Wilck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1616719966-10221-3-git-send-email-bmarzins@redhat.com \
    --to=bmarzins@redhat.com \
    --cc=Martin.Wilck@suse.com \
    --cc=christophe.varoqui@opensvc.com \
    --cc=dm-devel@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.