|
 |
4d51e5 |
From d96432835532fbcd8c72694c6ed68fca3ce98d5c Mon Sep 17 00:00:00 2001
|
|
|
4d51e5 |
From: David Teigland <teigland@redhat.com>
|
|
|
4d51e5 |
Date: Wed, 13 Apr 2022 12:16:57 -0500
|
|
|
4d51e5 |
Subject: [PATCH 44/54] devices file: remove extraneous unlock in vgchange -u
|
|
|
4d51e5 |
|
|
|
4d51e5 |
vgchange -u exit path was unlocking the devices file in cases
|
|
|
4d51e5 |
when it wasn't needed, which produced an warning.
|
|
|
4d51e5 |
---
|
|
|
4d51e5 |
lib/device/device_id.c | 7 +++----
|
|
|
4d51e5 |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
4d51e5 |
|
|
|
4d51e5 |
diff --git a/lib/device/device_id.c b/lib/device/device_id.c
|
|
|
4d51e5 |
index 6133e700a..20901ab90 100644
|
|
|
4d51e5 |
--- a/lib/device/device_id.c
|
|
|
4d51e5 |
+++ b/lib/device/device_id.c
|
|
|
4d51e5 |
@@ -1272,15 +1272,15 @@ void device_id_update_vg_uuid(struct cmd_context *cmd, struct volume_group *vg,
|
|
|
4d51e5 |
int update = 0;
|
|
|
4d51e5 |
|
|
|
4d51e5 |
if (!cmd->enable_devices_file)
|
|
|
4d51e5 |
- goto out;
|
|
|
4d51e5 |
+ return;
|
|
|
4d51e5 |
|
|
|
4d51e5 |
/* Without this setting there is no stacking LVs on PVs. */
|
|
|
4d51e5 |
if (!cmd->scan_lvs)
|
|
|
4d51e5 |
- goto out;
|
|
|
4d51e5 |
+ return;
|
|
|
4d51e5 |
|
|
|
4d51e5 |
/* Check if any devices file entries are stacked on LVs. */
|
|
|
4d51e5 |
if (!_device_ids_use_lvmlv(cmd))
|
|
|
4d51e5 |
- goto out;
|
|
|
4d51e5 |
+ return;
|
|
|
4d51e5 |
|
|
|
4d51e5 |
memcpy(old_vgid, old_vg_id, ID_LEN);
|
|
|
4d51e5 |
memcpy(new_vgid, &vg->id, ID_LEN);
|
|
|
4d51e5 |
@@ -1310,7 +1310,6 @@ void device_id_update_vg_uuid(struct cmd_context *cmd, struct volume_group *vg,
|
|
|
4d51e5 |
if (update &&
|
|
|
4d51e5 |
!device_ids_write(cmd))
|
|
|
4d51e5 |
stack;
|
|
|
4d51e5 |
- out:
|
|
|
4d51e5 |
unlock_devices_file(cmd);
|
|
|
4d51e5 |
}
|
|
|
4d51e5 |
|
|
|
4d51e5 |
--
|
|
|
4d51e5 |
2.34.3
|
|
|
4d51e5 |
|