From e6a6954ef1efa3637a97765626ef23d2f81cbc8f Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Wed, 9 Nov 2005 23:57:40 +0000 Subject: [PATCH] revert - alternative pvmove fix, disabling preloading completely for now --- libdm/libdevmapper.h | 3 +-- libdm/libdm-deptree.c | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 022290439..75e19f891 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -274,8 +274,7 @@ int dm_tree_deactivate_children(struct dm_tree_node *dnode, */ int dm_tree_preload_children(struct dm_tree_node *dnode, const char *uuid_prefix, - size_t uuid_prefix_len, - int resume_children); + size_t uuid_prefix_len); /* * Resume a device plus all dependencies. diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 6886b4a50..34d41bbf0 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1357,8 +1357,7 @@ out: int dm_tree_preload_children(struct dm_tree_node *dnode, const char *uuid_prefix, - size_t uuid_prefix_len, - int resume_children) + size_t uuid_prefix_len) { void *handle = NULL; struct dm_tree_node *child; @@ -1377,7 +1376,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, continue; if (dm_tree_node_num_children(child, 0)) - dm_tree_preload_children(child, uuid_prefix, uuid_prefix_len, resume_children); + dm_tree_preload_children(child, uuid_prefix, uuid_prefix_len); if (!(name = dm_tree_node_get_name(child))) { stack; @@ -1392,10 +1391,6 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, } } - /* Don't load tables yet if this flag is set */ - if (!resume_children) - continue; - if (!child->info.inactive_table && child->props.segment_count) { if (!_load_node(child)) { stack;