From 96d0004d12eef62a3b7d64a6ae2d02be84a885f8 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Fri, 26 Jun 2009 09:47:36 +0000 Subject: Convert the straight instances of vg_lock_and_read to new vg_read(_for_update). Sun May 3 11:40:51 CEST 2009 Petr Rockai * Convert the straight instances of vg_lock_and_read to new vg_read(_for_update). Author: Petr Rockai Committer: Dave Wysochanski --- tools/vgmerge.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tools/vgmerge.c') diff --git a/tools/vgmerge.c b/tools/vgmerge.c index f5072193..23b95a47 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -28,17 +28,15 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, } log_verbose("Checking for volume group \"%s\"", vg_name_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))) + vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0); + if (vg_read_error(vg_to)) return ECMD_FAILED; log_verbose("Checking for volume group \"%s\"", vg_name_from); - 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); + 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); return ECMD_FAILED; } -- cgit