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/vgrename.c | |
| parent | 58e57a05c0d49a53e1631d54e76351cc6ee34158 (diff) | |
| download | lvm2-25a2e7b80ecd0a0c8ce51380aa9aaf2b646225c9.tar.gz lvm2-25a2e7b80ecd0a0c8ce51380aa9aaf2b646225c9.tar.xz lvm2-25a2e7b80ecd0a0c8ce51380aa9aaf2b646225c9.zip | |
Pre-release cleanups.
Diffstat (limited to 'tools/vgrename.c')
| -rw-r--r-- | tools/vgrename.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/vgrename.c b/tools/vgrename.c index 205ba3e3..932c4d7b 100644 --- a/tools/vgrename.c +++ b/tools/vgrename.c @@ -83,7 +83,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, } if (!vg_check_status(vg, CLUSTERED | LVM_WRITE)) { - unlock_release_vg(cmd, vg, vg_name_old); + unlock_and_release_vg(cmd, vg, vg_name_old); return 0; } @@ -91,7 +91,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, vg_check_status(vg, EXPORTED_VG); if (lvs_in_vg_activated_by_uuid_only(vg)) { - unlock_release_vg(cmd, vg, vg_name_old); + unlock_and_release_vg(cmd, vg, vg_name_old); log_error("Volume group \"%s\" still has active LVs", vg_name_old); /* FIXME Remove this restriction */ @@ -101,7 +101,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, log_verbose("Checking for new volume group \"%s\"", vg_name_new); if (!lock_vol(cmd, vg_name_new, LCK_VG_WRITE)) { - unlock_release_vg(cmd, vg, vg_name_old); + unlock_and_release_vg(cmd, vg, vg_name_old); log_error("Can't get lock for %s", vg_name_new); return 0; } @@ -151,8 +151,8 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, backup(vg); backup_remove(cmd, vg_name_old); - unlock_release_vg(cmd, vg_new, vg_name_new); - unlock_release_vg(cmd, vg, vg_name_old); + unlock_and_release_vg(cmd, vg_new, vg_name_new); + unlock_and_release_vg(cmd, vg, vg_name_old); log_print("Volume group \"%s\" successfully renamed to \"%s\"", vg_name_old, vg_name_new); @@ -164,8 +164,8 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, return 1; error: - unlock_release_vg(cmd, vg_new, vg_name_new); - unlock_release_vg(cmd, vg, vg_name_old); + unlock_and_release_vg(cmd, vg_new, vg_name_new); + unlock_and_release_vg(cmd, vg, vg_name_old); return 0; } |