From 48d9b570b9900e33cce9b7ef5f2ee8ba9df80153 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Tue, 14 Jul 2009 02:16:05 +0000 Subject: [PATCH] Remove READ_REQUIRE_RESIZEABLE flag from vgsplit. Remove READ_REQUIRE_RESIZEABLE flag from vgsplit similar to the removal from vgextend. Move the check inside the functions that actually move pvs from one vg structure to another. Should be no functional change. Signed-off-by: Dave Wysochanski Acked-by: Alasdair G Kergon --- lib/metadata/metadata.c | 10 ++++++++++ tools/vgsplit.c | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 61e1c3b21..eb1192da1 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -70,6 +70,8 @@ static struct physical_volume *_find_pv_in_vg_by_uuid(const struct volume_group static vg_t *_vg_make_handle(struct cmd_context *cmd, struct volume_group *vg, uint32_t failure); +static uint32_t _vg_bad_status_bits(const struct volume_group *vg, + uint32_t status); unsigned long set_pe_align(struct physical_volume *pv, unsigned long data_alignment) { @@ -287,6 +289,10 @@ int move_pv(struct volume_group *vg_from, struct volume_group *vg_to, return 0; } + if (_vg_bad_status_bits(vg_from, RESIZEABLE_VG) || + _vg_bad_status_bits(vg_to, RESIZEABLE_VG)) + return 0; + dm_list_move(&vg_to->pvs, &pvl->list); vg_from->pv_count--; @@ -319,6 +325,10 @@ int move_pvs_used_by_lv(struct volume_group *vg_from, return 0; } + if (_vg_bad_status_bits(vg_from, RESIZEABLE_VG) || + _vg_bad_status_bits(vg_to, RESIZEABLE_VG)) + return 0; + dm_list_iterate_items(lvseg, &lvl->lv->segments) { if (lvseg->log_lv) if (!move_pvs_used_by_lv(vg_from, vg_to, diff --git a/tools/vgsplit.c b/tools/vgsplit.c index f4f9e6f16..35c425a42 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -248,8 +248,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) log_verbose("Checking for volume group \"%s\"", vg_name_from); - vg_from = vg_read_for_update(cmd, vg_name_from, NULL, - READ_REQUIRE_RESIZEABLE); + vg_from = vg_read_for_update(cmd, vg_name_from, NULL, 0); if (vg_read_error(vg_from)) { vg_release(vg_from); return ECMD_FAILED; @@ -283,8 +282,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) if (vg_read_error(vg_to) == FAILED_EXIST) { existing_vg = 1; vg_release(vg_to); - vg_to = vg_read_for_update(cmd, vg_name_to, NULL, - READ_REQUIRE_RESIZEABLE); + vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0); if (vg_read_error(vg_to)) { vg_release(vg_to);