summaryrefslogtreecommitdiffstats
path: root/tools/lvrename.c
diff options
context:
space:
mode:
authorMilan Broz <mbroz@redhat.com>2009-04-10 10:01:38 +0000
committerMilan Broz <mbroz@redhat.com>2009-04-10 10:01:38 +0000
commit043b13625b7eed0a52a80d46b7b6eda48cfdf82e (patch)
tree6aaf950aefb97feeb65447ff6f3f4e2ad2597f64 /tools/lvrename.c
parent405366fd48f8a39b7c1759eedd1dad0cbe05346f (diff)
downloadlvm2-043b13625b7eed0a52a80d46b7b6eda48cfdf82e.tar.gz
lvm2-043b13625b7eed0a52a80d46b7b6eda48cfdf82e.tar.xz
lvm2-043b13625b7eed0a52a80d46b7b6eda48cfdf82e.zip
Properly release VG memory pool in all CLI tools.
Diffstat (limited to 'tools/lvrename.c')
-rw-r--r--tools/lvrename.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/lvrename.c b/tools/lvrename.c
index 1444566b..f816152d 100644
--- a/tools/lvrename.c
+++ b/tools/lvrename.c
@@ -27,8 +27,9 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
char *lv_name_old, *lv_name_new;
const char *vg_name, *vg_name_new, *vg_name_old;
char *st;
+ int r = ECMD_FAILED;
- struct volume_group *vg;
+ struct volume_group *vg = NULL;
struct lv_list *lvl;
if (argc == 3) {
@@ -115,14 +116,11 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
if (!lv_rename(cmd, lvl->lv, lv_name_new))
goto error;
- unlock_vg(cmd, vg_name);
-
log_print("Renamed \"%s\" to \"%s\" in volume group \"%s\"",
lv_name_old, lv_name_new, vg_name);
- return ECMD_PROCESSED;
-
- error:
- unlock_vg(cmd, vg_name);
- return ECMD_FAILED;
+ r = ECMD_PROCESSED;
+error:
+ unlock_release_vg(cmd, vg, vg_name);
+ return r;
}