diff options
| author | Dave Wysochanski <dwysocha@redhat.com> | 2009-07-01 16:59:37 +0000 |
|---|---|---|
| committer | Dave Wysochanski <dwysocha@redhat.com> | 2009-07-01 16:59:37 +0000 |
| commit | b8b3508c59da5eed15b8db507fd8ef6cc771823f (patch) | |
| tree | fafe5f2315c4b30a299bc3b2cf7fe003c867c7ea /tools/vgmerge.c | |
| parent | 4397ad387e39989701081ab7f66ea35491f350a5 (diff) | |
| download | lvm2-b8b3508c59da5eed15b8db507fd8ef6cc771823f.tar.gz | |
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).
Rebased 6/26/09 by Dave W.
Diffstat (limited to 'tools/vgmerge.c')
| -rw-r--r-- | tools/vgmerge.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c index f5072193e..3ed6c507e 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -28,16 +28,14 @@ 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))) { + vg_from = vg_read_for_update(cmd, vg_name_from, NULL, + LOCK_NONBLOCKING); + if (vg_read_error(vg_from)) { unlock_and_release_vg(cmd, vg_to, vg_name_to); return ECMD_FAILED; } |