mirror of
git://sourceware.org/git/lvm2.git
synced 2025-03-11 20:58:50 +03:00
4c611a220a
Fix vg_read() error paths to properly release upon vg_read_error(). Note that in the iterator paths (process_each_*()), we release inside the iterator so no individual cleanup is needed. However there are a number of other places we missed the cleanup. Proper cleanup when vg_read_error() is true should be calling vg_release(vg), since there should be no locks held if we get an error (except in certain special cases, which IMO we should work to remove from the code). Unfortunately the testsuite is unable to detect these types of memory leaks. Most of them can be easily seen if you try an operation (e.g. lvcreate) with a volume group that does not exist. Error message looks like this: Volume group "vg2" not found You have a memory leak (not released memory pool): [0x1975eb8] You have a memory leak (not released memory pool): [0x1975eb8] Author: Dave Wysochanski <dwysocha@redhat.com>
83 lines
2.0 KiB
C
83 lines
2.0 KiB
C
/*
|
|
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
|
|
* Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This file is part of LVM2.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU Lesser General Public License v.2.1.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "tools.h"
|
|
|
|
int vgextend(struct cmd_context *cmd, int argc, char **argv)
|
|
{
|
|
char *vg_name;
|
|
struct volume_group *vg = NULL;
|
|
int r = ECMD_FAILED;
|
|
|
|
if (!argc) {
|
|
log_error("Please enter volume group name and "
|
|
"physical volume(s)");
|
|
return EINVALID_CMD_LINE;
|
|
}
|
|
|
|
if (argc == 1) {
|
|
log_error("Please enter physical volume(s)");
|
|
return EINVALID_CMD_LINE;
|
|
}
|
|
|
|
vg_name = skip_dev_dir(cmd, argv[0], NULL);
|
|
argc--;
|
|
argv++;
|
|
|
|
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
|
|
log_error("Can't get lock for orphan PVs");
|
|
return ECMD_FAILED;
|
|
}
|
|
|
|
log_verbose("Checking for volume group \"%s\"", vg_name);
|
|
vg = vg_read_for_update(cmd, vg_name, NULL,
|
|
READ_REQUIRE_RESIZEABLE | LOCK_NONBLOCKING);
|
|
if (vg_read_error(vg)) {
|
|
vg_release(vg);
|
|
unlock_vg(cmd, VG_ORPHANS);
|
|
return ECMD_FAILED;
|
|
}
|
|
/********** FIXME
|
|
log_print("maximum logical volume size is %s",
|
|
(dummy = lvm_show_size(LVM_LV_SIZE_MAX(vg) / 2, LONG)));
|
|
dm_free(dummy);
|
|
dummy = NULL;
|
|
**********/
|
|
|
|
if (!archive(vg))
|
|
goto error;
|
|
|
|
/* extend vg */
|
|
if (!vg_extend(vg, argc, argv))
|
|
goto error;
|
|
|
|
/* ret > 0 */
|
|
log_verbose("Volume group \"%s\" will be extended by %d new "
|
|
"physical volumes", vg_name, argc);
|
|
|
|
/* store vg on disk(s) */
|
|
if (!vg_write(vg) || !vg_commit(vg))
|
|
goto error;
|
|
|
|
backup(vg);
|
|
log_print("Volume group \"%s\" successfully extended", vg_name);
|
|
r = ECMD_PROCESSED;
|
|
|
|
error:
|
|
unlock_and_release_vg(cmd, vg, vg_name);
|
|
unlock_vg(cmd, VG_ORPHANS);
|
|
return r;
|
|
}
|