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

revert - alternative pvmove fix, disabling preloading completely for now

Browse Source
This commit is contained in:
Alasdair Kergon 2005-11-09 23:57:40 +00:00
parent e178963c0b
commit e6a6954ef1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdm/libdevmapper.h
View File

@ -274,8 +274,7 @@ int dm_tree_deactivate_children(struct dm_tree_node *dnode,
*/ */
int dm_tree_preload_children(struct dm_tree_node *dnode, int dm_tree_preload_children(struct dm_tree_node *dnode,
const char *uuid_prefix, const char *uuid_prefix,
size_t uuid_prefix_len, size_t uuid_prefix_len);
int resume_children);
/* /*
* Resume a device plus all dependencies. * Resume a device plus all dependencies.

9
libdm/libdm-deptree.c
View File

@ -1357,8 +1357,7 @@ out:
int dm_tree_preload_children(struct dm_tree_node *dnode, int dm_tree_preload_children(struct dm_tree_node *dnode,
const char *uuid_prefix, const char *uuid_prefix,
size_t uuid_prefix_len, size_t uuid_prefix_len)
int resume_children)
{ {
void *handle = NULL; void *handle = NULL;
struct dm_tree_node *child; struct dm_tree_node *child;
@ -1377,7 +1376,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
continue; continue;
if (dm_tree_node_num_children(child, 0)) 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))) { if (!(name = dm_tree_node_get_name(child))) {
stack; 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 (!child->info.inactive_table && child->props.segment_count) {
if (!_load_node(child)) { if (!_load_node(child)) {
stack; stack;