summaryrefslogtreecommitdiffstats
path: root/tools/vgmerge.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/vgmerge.c')
-rw-r--r--tools/vgmerge.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c
index 23b95a47..f5072193 100644
--- a/tools/vgmerge.c
+++ b/tools/vgmerge.c
@@ -28,15 +28,17 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,
}
log_verbose("Checking for volume group \"%s\"", vg_name_to);
- vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0);
- if (vg_read_error(vg_to))
+ if (!(vg_to = vg_lock_and_read(cmd, vg_name_to, NULL, LCK_VG_WRITE,
+ CLUSTERED | EXPORTED_VG | LVM_WRITE,
+ CORRECT_INCONSISTENT | FAIL_INCONSISTENT)))
return ECMD_FAILED;
log_verbose("Checking for volume group \"%s\"", vg_name_from);
- vg_from = vg_read_for_update(cmd, vg_name_from, NULL,
- LOCK_NONBLOCKING);
- if (vg_read_error(vg_from)) {
- unlock_release_vg(cmd, vg_to, vg_name_to);
+ if (!(vg_from = vg_lock_and_read(cmd, vg_name_from, NULL,
+ LCK_VG_WRITE,
+ CLUSTERED | EXPORTED_VG | LVM_WRITE,
+ CORRECT_INCONSISTENT | FAIL_INCONSISTENT))) {
+ unlock_and_release_vg(cmd, vg_to, vg_name_to);
return ECMD_FAILED;
}