shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvremove: easier removal of dependent lvs

Browse Source 
Add function to remove lvs which are depending on removed lv
prior the lv is removed.

User is asked for confirmation.
This commit is contained in:
Zdenek Kabelac 2013-02-20 16:13:17 +01:00
parent 3679bb1cd9
commit d023b2d12f
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.99 - Version 2.02.99 -
=================================== ===================================
Add _lv_remove_segs_using_this_lv() for removal of dependent lvs.
Improve activation code for better support of stacked devices. Improve activation code for better support of stacked devices.
Add _add_layer_target_to_dtree() for adding linear layer into dtree. Add _add_layer_target_to_dtree() for adding linear layer into dtree.
Extend _cached_info() to accept layer string. Extend _cached_info() to accept layer string.

49
lib/metadata/lv_manip.c
View File

@ -3488,6 +3488,35 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
return 1; return 1;
} }
static int _lv_remove_segs_using_this_lv(struct cmd_context *cmd, struct logical_volume *lv,
const force_t force, unsigned level,
const char *lv_type)
{
struct seg_list *sl;
if ((force == PROMPT) &&
yes_no_prompt("Removing %s \"%s\" will remove %u dependent volume(s). "
"Proceed? [y/n]: ", lv_type, lv->name,
dm_list_size(&lv->segs_using_this_lv)) == 'n') {
log_error("Logical volume \"%s\" not removed.", lv->name);
return 0;
}
/*
* Not using _safe iterator here - since we may delete whole subtree
* (similar as process_each_lv_in_vg())
* the code is roughly equivalent to this:
*
* while (!dm_list_empty(&lv->segs_using_this_lv))
* dm_list_iterate_items(sl, &lv->segs_using_this_lv)
* break;
*/
dm_list_iterate_items(sl, &lv->segs_using_this_lv)
if (!lv_remove_with_dependencies(cmd, sl->seg->lv,
force, level + 1))
return_0;
return 1;
}
/* /*
* remove LVs with its dependencies - LV leaf nodes should be removed first * remove LVs with its dependencies - LV leaf nodes should be removed first
*/ */
@ -3496,7 +3525,6 @@ int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *
{ {
percent_t snap_percent; percent_t snap_percent;
struct dm_list *snh, *snht; struct dm_list *snh, *snht;
struct seg_list *sl, *tsl;
struct lvinfo info; struct lvinfo info;
if (lv_is_cow(lv)) { if (lv_is_cow(lv)) {
@ -3547,22 +3575,9 @@ int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *
return_0; return_0;
} }
if (lv_is_used_thin_pool(lv)) { if (lv_is_used_thin_pool(lv) &&
/* Remove thin LVs first */ !_lv_remove_segs_using_this_lv(cmd, lv, force, level, "pool"))
if ((force == PROMPT) && return_0;
yes_no_prompt("Removing pool %s will also remove %u "
"thin volume(s). OK? [y/n]: ", lv->name,
/* Note: Snaphosts not included */
dm_list_size(&lv->segs_using_this_lv)) == 'n') {
log_error("Logical volume %s not removed.", lv->name);
return 0;
}
dm_list_iterate_items_safe(sl, tsl, &lv->segs_using_this_lv)
if (!lv_remove_with_dependencies(cmd, sl->seg->lv,
force, level + 1))
return_0;
}
return lv_remove_single(cmd, lv, force); return lv_remove_single(cmd, lv, force);
} }