diff options
| author | David Teigland <teigland@redhat.com> | 2022-02-03 16:56:03 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2022-06-09 11:30:07 -0500 |
| commit | df2b1555aff71452cde156badec70117065c9e2c (patch) | |
| tree | 304d57cfdf45f300554a1a44ffe4c6e025de4a09 /lib | |
| parent | 4e72068216b006edc69c8bafba5198051e3ed1dd (diff) | |
| download | lvm2-df2b1555aff71452cde156badec70117065c9e2c.tar.gz | |
lvmdevices: make deldev work for missing device
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/device/device_id.c | 6 | ||||
| -rw-r--r-- | lib/device/device_id.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/device/device_id.c b/lib/device/device_id.c index ccc5f43a1..aeaa1ffc6 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -894,7 +894,7 @@ struct dev_use *get_du_for_pvid(struct cmd_context *cmd, const char *pvid) return NULL; } -static struct dev_use *_get_du_for_devname(struct cmd_context *cmd, const char *devname) +struct dev_use *get_du_for_devname(struct cmd_context *cmd, const char *devname) { struct dev_use *du; @@ -1093,7 +1093,7 @@ id_done: du_pvid = get_du_for_pvid(cmd, pvid); /* Is there already an entry using this device's name? */ - du_devname = _get_du_for_devname(cmd, dev_name(dev)); + du_devname = get_du_for_devname(cmd, dev_name(dev)); /* Is there already an entry using the device_id for this device? */ du_devid = _get_du_for_device_id(cmd, id->idtype, id->idname); @@ -1514,7 +1514,7 @@ int device_ids_match_dev(struct cmd_context *cmd, struct device *dev) struct dev_use *du; /* First check the du entry with matching devname since it's likely correct. */ - if ((du = _get_du_for_devname(cmd, dev_name(dev)))) { + if ((du = get_du_for_devname(cmd, dev_name(dev)))) { if (_match_du_to_dev(cmd, du, dev)) return 1; } diff --git a/lib/device/device_id.h b/lib/device/device_id.h index 4cf1374c8..2cd2fd7c6 100644 --- a/lib/device/device_id.h +++ b/lib/device/device_id.h @@ -40,6 +40,7 @@ void device_id_update_vg_uuid(struct cmd_context *cmd, struct volume_group *vg, struct dev_use *get_du_for_dev(struct cmd_context *cmd, struct device *dev); struct dev_use *get_du_for_pvid(struct cmd_context *cmd, const char *pvid); +struct dev_use *get_du_for_devname(struct cmd_context *cmd, const char *devname); char *devices_file_version(void); int devices_file_exists(struct cmd_context *cmd); |