|
 |
68b27c |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
68b27c |
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
68b27c |
Date: Thu, 25 Mar 2021 13:05:10 -0500
|
|
|
68b27c |
Subject: [PATCH] RH: make parse_vpd_pg83 match scsi_id output
|
|
|
68b27c |
|
|
|
68b27c |
Red Hat sets ID_SERIAL based on the result of scsi_id, instead of using
|
|
|
68b27c |
the result of sg_inq and 55-scsi-sg3_id.rules. Make parse_vpd_pg83 match
|
|
|
68b27c |
that.
|
|
|
68b27c |
|
|
|
68b27c |
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
68b27c |
---
|
|
|
68b27c |
libmultipath/discovery.c | 18 ++----------------
|
|
|
68b27c |
1 file changed, 2 insertions(+), 16 deletions(-)
|
|
|
68b27c |
|
|
|
68b27c |
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
|
|
|
68b27c |
index ec99a7aa..2704270e 100644
|
|
|
68b27c |
--- a/libmultipath/discovery.c
|
|
|
68b27c |
+++ b/libmultipath/discovery.c
|
|
|
68b27c |
@@ -1135,12 +1135,9 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
|
|
|
68b27c |
naa_prio = 7;
|
|
|
68b27c |
break;
|
|
|
68b27c |
case 2:
|
|
|
68b27c |
- /* IEEE Extended: Prio 6 */
|
|
|
68b27c |
- naa_prio = 6;
|
|
|
68b27c |
- break;
|
|
|
68b27c |
case 3:
|
|
|
68b27c |
- /* IEEE Locally assigned: Prio 1 */
|
|
|
68b27c |
- naa_prio = 1;
|
|
|
68b27c |
+ /* IEEE Extended or Locally assigned: Prio 6 */
|
|
|
68b27c |
+ naa_prio = 6;
|
|
|
68b27c |
break;
|
|
|
68b27c |
default:
|
|
|
68b27c |
/* Default: no priority */
|
|
|
68b27c |
@@ -1159,17 +1156,6 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
|
|
|
68b27c |
vpd = d;
|
|
|
68b27c |
}
|
|
|
68b27c |
break;
|
|
|
68b27c |
- case 0x8:
|
|
|
68b27c |
- /* SCSI Name: Prio 3 */
|
|
|
68b27c |
- if (memcmp(d + 4, "eui.", 4) &&
|
|
|
68b27c |
- memcmp(d + 4, "naa.", 4) &&
|
|
|
68b27c |
- memcmp(d + 4, "iqn.", 4))
|
|
|
68b27c |
- break;
|
|
|
68b27c |
- if (prio < 3) {
|
|
|
68b27c |
- prio = 3;
|
|
|
68b27c |
- vpd = d;
|
|
|
68b27c |
- }
|
|
|
68b27c |
- break;
|
|
|
68b27c |
case 0x1:
|
|
|
68b27c |
/* T-10 Vendor ID: Prio 2 */
|
|
|
68b27c |
if (prio < 2) {
|