shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-08 08:58:50 +03:00
Code Releases Activity

Return error to dm_tree_preload_children() and

Browse Source 
dm_tree_activate_children() callers.

Otherwise resume_lv and its variants can fail silently.

Catching these failures is especially important now that dm targets like
crypt and snapshot-merge can fail in .preresume

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mike Snitzer 2010-01-05 21:04:37 +00:00
parent 7a8fa6aaab
commit 2ca6b865f6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libdm/libdm-deptree.c
View File

@ -1140,6 +1140,7 @@ int dm_tree_activate_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 r = 1;
void *handle = NULL; void *handle = NULL;
struct dm_tree_node *child = dnode; struct dm_tree_node *child = dnode;
struct dm_info newinfo; struct dm_info newinfo;
@ -1158,7 +1159,8 @@ int dm_tree_activate_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_activate_children(child, uuid_prefix, uuid_prefix_len); if (!dm_tree_activate_children(child, uuid_prefix, uuid_prefix_len))
return_0;
} }
handle = NULL; handle = NULL;
@ -1204,6 +1206,7 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
log_error("Unable to resume %s (%" PRIu32 log_error("Unable to resume %s (%" PRIu32
":%" PRIu32 ")", child->name, child->info.major, ":%" PRIu32 ")", child->name, child->info.major,
child->info.minor); child->info.minor);
r = 0;
continue; continue;
} }
@ -1214,7 +1217,7 @@ int dm_tree_activate_children(struct dm_tree_node *dnode,
handle = NULL; handle = NULL;
return 1; return r;
} }
static int _create_node(struct dm_tree_node *dnode) static int _create_node(struct dm_tree_node *dnode)
@ -1605,6 +1608,7 @@ 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 r = 1;
void *handle = NULL; void *handle = NULL;
struct dm_tree_node *child; struct dm_tree_node *child;
struct dm_info newinfo; struct dm_info newinfo;
@ -1621,7 +1625,8 @@ 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); if (!dm_tree_preload_children(child, uuid_prefix, uuid_prefix_len))
return_0;
/* FIXME Cope if name exists with no uuid? */ /* FIXME Cope if name exists with no uuid? */
if (!child->info.exists) { if (!child->info.exists) {
@ -1655,6 +1660,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
log_error("Unable to resume %s (%" PRIu32 log_error("Unable to resume %s (%" PRIu32
":%" PRIu32 ")", child->name, child->info.major, ":%" PRIu32 ")", child->name, child->info.major,
child->info.minor); child->info.minor);
r = 0;
continue; continue;
} }
@ -1664,7 +1670,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
handle = NULL; handle = NULL;
return 1; return r;
} }
/* /*