revert - alternative pvmove fix, disabling preloading completely for now

diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 0222904396816a494e329320f358d0ed1f9c4079..75e19f891dcbc1536dc59e37120121befc922220 100644 (file)
--- 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 6886b4a50298011ddba0a34e0cabe0ac523b2ff7..34d41bbf027719552c1d25eeb57a3324a12bdc05 100644 (file)
--- 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;