[dm-devel] [PATCH 2/4] libmultipath: fix priorities in parse_vpd_pg83

[Martin Wilck]

On Thu, 2021-03-25 at 19:52 -0500, Benjamin Marzinski wrote:
> 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.

I think we should rather change the udev rules file, to be consistent
with what the kernel does:

https://elixir.bootlin.com/linux/latest/A/ident/designator_prio

Regards
Martin



> 
> Signed-off-by: Benjamin Marzinski <bmarzins at 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;

-- 
Dr. Martin Wilck <mwilck at suse.com>, Tel. +49 (0)911 74053 2107
SUSE Software Solutions Germany GmbH
HRB 36809, AG Nürnberg GF: Felix Imendörffer