From 043b13625b7eed0a52a80d46b7b6eda48cfdf82e Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 10 Apr 2009 10:01:38 +0000 Subject: Properly release VG memory pool in all CLI tools. --- tools/lvrename.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tools/lvrename.c') 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; } -- cgit