mirror of
git://sourceware.org/git/lvm2.git
synced 2024-10-27 18:55:19 +03:00
d38bf3616c
Fix missing VG unlocks in some pvchange error paths. Add some missing validation of VG names. Rename validate_vg_name() to validate_new_vg_name(). Change orphan lock to VG_ORPHANS. Change format1 to use ORPHAN as orphan VG name.
87 lines
2.1 KiB
C
87 lines
2.1 KiB
C
/*
|
|
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
|
|
* Copyright (C) 2004-2007 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;
|
|
|
|
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);
|
|
if (!(vg = vg_lock_and_read(cmd, vg_name, LCK_VG_WRITE | LCK_NONBLOCK,
|
|
CLUSTERED | EXPORTED_VG |
|
|
LVM_WRITE | RESIZEABLE_VG,
|
|
CORRECT_INCONSISTENT | FAIL_INCONSISTENT))) {
|
|
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);
|
|
|
|
unlock_vg(cmd, vg_name);
|
|
unlock_vg(cmd, VG_ORPHANS);
|
|
|
|
log_print("Volume group \"%s\" successfully extended", vg_name);
|
|
|
|
return ECMD_PROCESSED;
|
|
|
|
error:
|
|
unlock_vg(cmd, vg_name);
|
|
unlock_vg(cmd, VG_ORPHANS);
|
|
return ECMD_FAILED;
|
|
}
|