summaryrefslogtreecommitdiff
path: root/tools/vgrename.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2010-12-08 20:50:48 +0000
committerAlasdair Kergon <agk@redhat.com>2010-12-08 20:50:48 +0000
commit2b82bd79f59ffb49cc864cf0d2e9268c652443d3 (patch)
tree597817553c3ff5b4d6072e7ee37508b6deafe830 /tools/vgrename.c
parente8bed35ddf264c67c44b9cf9cedef6b078bfd710 (diff)
downloadlvm2-2b82bd79f59ffb49cc864cf0d2e9268c652443d3.tar.gz
Rename vg_release to free_vg.
Diffstat (limited to 'tools/vgrename.c')
-rw-r--r--tools/vgrename.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/vgrename.c b/tools/vgrename.c
index 3c383fbd6..98be9a960 100644
--- a/tools/vgrename.c
+++ b/tools/vgrename.c
@@ -25,7 +25,7 @@ static struct volume_group *_get_old_vg_for_rename(struct cmd_context *cmd,
nevertheless. */
vg = vg_read_for_update(cmd, vg_name_old, vgid, READ_ALLOW_EXPORTED);
if (vg_read_error(vg)) {
- vg_release(vg);
+ free_vg(vg);
return_NULL;
}
@@ -117,7 +117,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
return_0;
if (!_lock_new_vg_for_rename(cmd, vg_name_new)) {
- unlock_and_release_vg(cmd, vg, vg_name_old);
+ unlock_and_free_vg(cmd, vg, vg_name_old);
return_0;
}
} else {
@@ -168,7 +168,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
backup_remove(cmd, vg_name_old);
unlock_vg(cmd, vg_name_new);
- unlock_and_release_vg(cmd, vg, vg_name_old);
+ unlock_and_free_vg(cmd, vg, vg_name_old);
log_print("Volume group \"%s\" successfully renamed to \"%s\"",
vg_name_old, vg_name_new);
@@ -182,9 +182,9 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
error:
if (lock_vg_old_first) {
unlock_vg(cmd, vg_name_new);
- unlock_and_release_vg(cmd, vg, vg_name_old);
+ unlock_and_free_vg(cmd, vg, vg_name_old);
} else {
- unlock_and_release_vg(cmd, vg, vg_name_old);
+ unlock_and_free_vg(cmd, vg, vg_name_old);
unlock_vg(cmd, vg_name_new);
}
return 0;