shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

libdm: proper traversion of revert list

Browse Source 
Deactivation of top level node has to happen,
before traversing subtree.

Swap list logic and rather append new nodes to the head
and then use normal iteration.

(in-release update)
This commit is contained in:
Zdenek Kabelac 2014-02-24 09:36:38 +01:00
parent 1911c61639
commit 6116333ccc
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libdm/libdm-deptree.c
View File

@ -2625,13 +2625,16 @@ out:
return r; return r;
} }
/*
* Currently try to deactivate only nodes created during preload.
* New node is always attached to the front of activated_list
*/
static int _dm_tree_revert_activated(struct dm_tree_node *parent) static int _dm_tree_revert_activated(struct dm_tree_node *parent)
{ {
struct dm_tree_node *child; struct dm_tree_node *child;
dm_list_iterate_back_items_gen(child, &parent->activated, activated_list) { dm_list_iterate_items_gen(child, &parent->activated, activated_list) {
_dm_tree_revert_activated(child); log_debug_activation("Reverting %s.", child->name);
log_debug("Reverting preloaded %s.", child->name);
if (!_deactivate_node(child->name, child->info.major, child->info.minor, if (!_deactivate_node(child->name, child->info.major, child->info.minor,
&child->dtree->cookie, child->udev_flags, 0)) { &child->dtree->cookie, child->udev_flags, 0)) {
log_error("Unable to deactivate %s (%" PRIu32 log_error("Unable to deactivate %s (%" PRIu32
@ -2639,6 +2642,8 @@ static int _dm_tree_revert_activated(struct dm_tree_node *parent)
child->info.minor); child->info.minor);
return 0; return 0;
} }
if (!_dm_tree_revert_activated(child))
return_0;
} }
return 1; return 1;
@ -2708,9 +2713,10 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
continue; continue;
} }
if (!child->info.live_table) if (!child->info.live_table) {
/* Collect newly introduced devices for revert */ /* Collect newly introduced devices for revert */
dm_list_add(&dnode->activated, &child->activated_list); dm_list_add_h(&dnode->activated, &child->activated_list);
}
/* Update cached info */ /* Update cached info */
child->info = newinfo; child->info = newinfo;