shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

device_id: improve handling of non-standard wwid prefixes

Browse Source
This commit is contained in:
David Teigland 2023-10-16 15:09:17 -05:00
parent e6c6713a1b
commit d8d4260df8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/device/device_id.c
View File

@ -427,7 +427,7 @@ static int _wwid_type_num(char *id)
else if (!strncmp(id, "t10.", 4)) else if (!strncmp(id, "t10.", 4))
return 1; return 1;
else else
return -1; return 0; /* any unrecognized, non-standard prefix */
} }
int wwid_type_to_idtype(int wwid_type) int wwid_type_to_idtype(int wwid_type)
@ -436,6 +436,7 @@ int wwid_type_to_idtype(int wwid_type)
case 3: return DEV_ID_TYPE_WWID_NAA; case 3: return DEV_ID_TYPE_WWID_NAA;
case 2: return DEV_ID_TYPE_WWID_EUI; case 2: return DEV_ID_TYPE_WWID_EUI;
case 1: return DEV_ID_TYPE_WWID_T10; case 1: return DEV_ID_TYPE_WWID_T10;
case 0: return DEV_ID_TYPE_SYS_WWID;
default: return -1; default: return -1;
} }
} }
@ -446,6 +447,7 @@ int idtype_to_wwid_type(int idtype)
case DEV_ID_TYPE_WWID_NAA: return 3; case DEV_ID_TYPE_WWID_NAA: return 3;
case DEV_ID_TYPE_WWID_EUI: return 2; case DEV_ID_TYPE_WWID_EUI: return 2;
case DEV_ID_TYPE_WWID_T10: return 1; case DEV_ID_TYPE_WWID_T10: return 1;
case DEV_ID_TYPE_SYS_WWID: return 0;
default: return -1; default: return -1;
} }
} }
@ -473,11 +475,8 @@ struct dev_wwid *dev_add_wwid(char *id, int id_type, struct dm_list *ids)
struct dev_wwid *dw; struct dev_wwid *dw;
int len; int len;
if (!id_type) { if (!id_type)
id_type = _wwid_type_num(id); id_type = _wwid_type_num(id);
if (id_type == -1)
log_debug("unknown wwid type %s", id);
}
if (!(dw = zalloc(sizeof(struct dev_wwid)))) if (!(dw = zalloc(sizeof(struct dev_wwid))))
return NULL; return NULL;