diff options
| author | Alasdair Kergon <agk@redhat.com> | 2009-05-21 03:04:52 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2009-05-21 03:04:52 +0000 |
| commit | 25a2e7b80ecd0a0c8ce51380aa9aaf2b646225c9 (patch) | |
| tree | ff216b29090ad4aab90887345ffe3a7cdfe59fdd /tools/vgmerge.c | |
| parent | 58e57a05c0d49a53e1631d54e76351cc6ee34158 (diff) | |
| download | lvm2-25a2e7b80ecd0a0c8ce51380aa9aaf2b646225c9.tar.gz | |
Pre-release cleanups.
Diffstat (limited to 'tools/vgmerge.c')
| -rw-r--r-- | tools/vgmerge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 57a700e13..f5072193e 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -38,7 +38,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, LCK_VG_WRITE, CLUSTERED | EXPORTED_VG | LVM_WRITE, CORRECT_INCONSISTENT | FAIL_INCONSISTENT))) { - unlock_release_vg(cmd, vg_to, vg_name_to); + unlock_and_release_vg(cmd, vg_to, vg_name_to); return ECMD_FAILED; } @@ -116,8 +116,8 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, vg_from->name, vg_to->name); r = ECMD_PROCESSED; bad: - unlock_release_vg(cmd, vg_from, vg_name_from); - unlock_release_vg(cmd, vg_to, vg_name_to); + unlock_and_release_vg(cmd, vg_from, vg_name_from); + unlock_and_release_vg(cmd, vg_to, vg_name_to); return r; } |