From 63d32fb6a6e2d77d74967c7874595b0fe0e2dd0b Mon Sep 17 00:00:00 2001 From: Jonathan Earl Brassow Date: Thu, 18 Aug 2011 19:31:33 +0000 Subject: [PATCH] When down-converting RAID1, don't activate sub-lvs between suspend/resume of top-level LV. We can't activate sub-lv's that are being removed from a RAID1 LV while it is suspended. However, this is what was being used to have them show-up so we could remove them. 'sync_local_dev_names' is a sufficient and proper replacement and can be done after the top-level LV is resumed. --- WHATS_NEW | 1 + lib/metadata/raid_manip.c | 18 +++--------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 56778d132..92a7938a3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.88 - ================================== + When down-converting RAID1, don't activate sub-lvs between suspend/resume Add -V as short form of --virtualsize in lvcreate. Fix make clean not to remove Makefile. (2.02.87) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 545c79bc3..4a00820e5 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -488,22 +488,9 @@ int lv_raid_change_image_count(struct logical_volume *lv, } /* - * Bring extracted LVs into existance, so there are no - * conflicts for the main RAID device's resume + * Resume original LV + * This also resumes all other sub-lvs (including the extracted) */ - if (!dm_list_empty(&removal_list)) { - dm_list_iterate_items(lvl, &removal_list) { - /* If top RAID was EX, use EX */ - if (lv_is_active_exclusive_locally(lv)) { - if (!activate_lv_excl(lv->vg->cmd, lvl->lv)) - return_0; - } else { - if (!activate_lv(lv->vg->cmd, lvl->lv)) - return_0; - } - } - } - if (!resume_lv(lv->vg->cmd, lv)) { log_error("Failed to resume %s/%s after committing changes", lv->vg->name, lv->name); @@ -513,6 +500,7 @@ int lv_raid_change_image_count(struct logical_volume *lv, /* * Eliminate the extracted LVs */ + sync_local_dev_names(lv->vg->cmd); if (!dm_list_empty(&removal_list)) { dm_list_iterate_items(lvl, &removal_list) { if (!deactivate_lv(lv->vg->cmd, lvl->lv))