Skip r assignment

Cosmetic, since r is already 0 for the error path, no need to assign it there,
and r is assigned to 1 after switch command.
Also makes the code more readable.

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index b01dfc5f267670e4b849c9fa3d8b4412729262e3..9aa53b6c83d59b9360f45faa2c4a94152b3fcb46 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1882,9 +1882,8 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv,
        case DEACTIVATE:
                if (retry_deactivation())
                        dm_tree_retry_remove(root);
-               /* Deactivate LV and all devices it references that nothing else has open. */
-               r = dm_tree_deactivate_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1);
-               if (!r)
+               /* Deactivate LV and all devices it references that nothing else has open. */
+               if (!dm_tree_deactivate_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
                        goto_out;
                if (!_remove_lv_symlinks(dm, root))
                        log_error("Failed to remove all device symlinks associated with %s.", lv->name);
@@ -1905,16 +1904,14 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv,
                        goto_out;
 
                /* Preload any devices required before any suspensions */
-               r = dm_tree_preload_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1);
-               if (!r)
+               if (!dm_tree_preload_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
                        goto_out;
 
                if (dm_tree_node_size_changed(root))
                        dm->flush_required = 1;
 
                if (action == ACTIVATE) {
-                       r = dm_tree_activate_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1);
-                       if (!r)
+                       if (!dm_tree_activate_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
                                goto_out;
                        if (!_create_lv_symlinks(dm, root)) {
                                log_error("Failed to create symlinks for %s.", lv->name);