diff options
| author | Dave Wysochanski <dwysocha@redhat.com> | 2009-06-26 09:47:36 +0000 |
|---|---|---|
| committer | Dave Wysochanski <dwysocha@redhat.com> | 2009-06-26 09:47:36 +0000 |
| commit | 96d0004d12eef62a3b7d64a6ae2d02be84a885f8 (patch) | |
| tree | 92a83e5b80c05a0d8a447ba4524a84cd4185d58d /tools/vgmerge.c | |
| parent | 2f5a1df42cbd5b6a10d994a80e24b8df1a62d5ee (diff) | |
| download | lvm2-96d0004d12eef62a3b7d64a6ae2d02be84a885f8.tar.gz lvm2-96d0004d12eef62a3b7d64a6ae2d02be84a885f8.tar.xz lvm2-96d0004d12eef62a3b7d64a6ae2d02be84a885f8.zip | |
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 <me@mornfall.net>
* Convert the straight instances of vg_lock_and_read to new vg_read(_for_update).
Author: Petr Rockai <prockai@redhat.com>
Committer: Dave Wysochanski <dwysocha@redhat.com>
Diffstat (limited to 'tools/vgmerge.c')
| -rw-r--r-- | tools/vgmerge.c | 14 |
1 files changed, 6 insertions, 8 deletions
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; } |