From: Mike Snitzer Date: Fri, 20 Nov 2009 16:29:09 -0500 Subject: [PATCH 2/5] libdm-deptree-return-failure-suspend-children In-Reply-To: <1258752552-1589-1-git-send-email-snitzer@redhat.com> References: <1258752552-1589-1-git-send-email-snitzer@redhat.com> Message-ID: <1258752552-1589-2-git-send-email-snitzer@redhat.com> List-Id: To: lvm-devel@redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return error immediately to dm_tree_suspend_children() callers. Otherwise suspend_lv and its variants can fail silently. Signed-off-by: Mike Snitzer --- libdm/libdm-deptree.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index bb10fe5..6f5355d 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1109,7 +1109,7 @@ int dm_tree_suspend_children(struct dm_tree_node *dnode, log_error("Unable to suspend %s (%" PRIu32 ":%" PRIu32 ")", name, info.major, info.minor); - continue; + return 0; } /* Update cached info */ @@ -1130,7 +1130,8 @@ int dm_tree_suspend_children(struct dm_tree_node *dnode, continue; if (dm_tree_node_num_children(child, 0)) - dm_tree_suspend_children(child, uuid_prefix, uuid_prefix_len); + if (!dm_tree_suspend_children(child, uuid_prefix, uuid_prefix_len)) + return_0; } return 1; -- 1.6.5.2