From bce8cac1f434facf806641c4483416b2495fb561 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 3 Aug 2009 11:20:15 +0000 Subject: [PATCH] cleanup some ignored return values & 'stack's --- lib/activate/dev_manager.c | 20 ++++++++++++-------- libdm/libdm-common.c | 2 +- tools/dmsetup.c | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index a6024632f..0b9bb56dd 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1133,10 +1133,11 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root) dm_tree_set_cookie(root, 0); if (!dm_tree_deactivate_children(root, uuid, strlen(uuid))) { - dm_udev_cleanup(dm_tree_get_cookie(root)); + (void) dm_udev_cleanup(dm_tree_get_cookie(root)); return_0; } - dm_udev_wait(dm_tree_get_cookie(root)); + if (!dm_udev_wait(dm_tree_get_cookie(root))) + stack; } return 1; @@ -1171,10 +1172,11 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv, actio /* Deactivate LV and all devices it references that nothing else has open. */ dm_tree_set_cookie(root, 0); if (!dm_tree_deactivate_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1)) { - dm_udev_cleanup(dm_tree_get_cookie(root)); + (void) dm_udev_cleanup(dm_tree_get_cookie(root)); goto_out; } - dm_udev_wait(dm_tree_get_cookie(root)); + if (!dm_udev_wait(dm_tree_get_cookie(root))) + stack; if (!_remove_lv_symlinks(dm, root)) log_error("Failed to remove all device symlinks associated with %s.", lv->name); break; @@ -1195,10 +1197,11 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv, actio /* Preload any devices required before any suspensions */ dm_tree_set_cookie(root, 0); if (!dm_tree_preload_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1)) { - dm_udev_cleanup(dm_tree_get_cookie(root)); + (void) dm_udev_cleanup(dm_tree_get_cookie(root)); goto_out; } - dm_udev_wait(dm_tree_get_cookie(root)); + if (!dm_udev_wait(dm_tree_get_cookie(root))) + stack; if (dm_tree_node_size_changed(root)) dm->flush_required = 1; @@ -1206,10 +1209,11 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv, actio if (action == ACTIVATE) { dm_tree_set_cookie(root, 0); if (!dm_tree_activate_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1)) { - dm_udev_cleanup(dm_tree_get_cookie(root)); + (void) dm_udev_cleanup(dm_tree_get_cookie(root)); goto_out; } - dm_udev_wait(dm_tree_get_cookie(root)); + if (!dm_udev_wait(dm_tree_get_cookie(root))) + stack; } if (!_create_lv_symlinks(dm, root)) { diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index a5b8b2ef4..134487bc4 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -1065,7 +1065,7 @@ int dm_udev_cleanup(uint32_t cookie) return 1; if (!_get_cookie_sem(cookie, &semid)) - return 0; + return_0; return _udev_notify_sem_destroy(semid, cookie); } diff --git a/tools/dmsetup.c b/tools/dmsetup.c index e189cc88c..d0da19068 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -593,7 +593,7 @@ static int _create(int argc, char **argv, void *data __attribute((unused))) goto out; } - dm_udev_wait(cookie); + (void) dm_udev_wait(cookie); r = 1; @@ -631,7 +631,7 @@ static int _rename(int argc, char **argv, void *data __attribute((unused))) goto out; } - dm_udev_wait(cookie); + (void) dm_udev_wait(cookie); r = 1; -- 2.43.5