Use constant for the repeated dlid size specification

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index ba80e5de38e95bc53055882d1b357ad55b74f92f..fb269e429c78c8dcc322f395cc3eb85cfc83825f 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1852,6 +1852,7 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root, char *
 static int _tree_action(struct dev_manager *dm, struct logical_volume *lv,
                        struct lv_activate_opts *laopts, action_t action)
 {
+       const size_t DLID_SIZE = ID_LEN + sizeof(UUID_PREFIX) - 1;
        struct dm_tree *dtree;
        struct dm_tree_node *root;
        char *dlid;
@@ -1882,7 +1883,7 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv,
                if (retry_deactivation())
                        dm_tree_retry_remove(root);
                /* 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))
+               if (!dm_tree_deactivate_children(root, dlid, DLID_SIZE))
                        goto_out;
                if (!_remove_lv_symlinks(dm, root))
                        log_warn("Failed to remove all device symlinks associated with %s.", lv->name);
@@ -1893,7 +1894,7 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv,
                        dm_tree_use_no_flush_suspend(root);
                /* Fall through */
        case SUSPEND_WITH_LOCKFS:
-               if (!dm_tree_suspend_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
+               if (!dm_tree_suspend_children(root, dlid, DLID_SIZE))
                        goto_out;
                break;
        case PRELOAD:
@@ -1903,14 +1904,14 @@ static int _tree_action(struct dev_manager *dm, struct logical_volume *lv,
                        goto_out;
 
                /* Preload any devices required before any suspensions */
-               if (!dm_tree_preload_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
+               if (!dm_tree_preload_children(root, dlid, DLID_SIZE))
                        goto_out;
 
                if (dm_tree_node_size_changed(root))
                        dm->flush_required = 1;
 
                if (action == ACTIVATE) {
-                       if (!dm_tree_activate_children(root, dlid, ID_LEN + sizeof(UUID_PREFIX) - 1))
+                       if (!dm_tree_activate_children(root, dlid, DLID_SIZE))
                                goto_out;
                        if (!_create_lv_symlinks(dm, root))
                                log_warn("Failed to create symlinks for %s.", lv->name);