Thin clean

Reuse seg pointer already set in _add_lv_to_dtree to have the
value of first_seg(lv) (and is used in other parts of this function).

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index b15402e5cea362d9865ac4f07aac748eebb9a96e..4f7e6acbe6e256881fc84d459a54925b2c95e1e7 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1100,17 +1100,16 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
                return_0;
 
        if (lv_is_thin_pool(lv)) {
-               if (!_add_dev_to_dtree(dm, dtree, lv, "tpool"))
-                       return_0;
-               if (!_add_lv_to_dtree(dm, dtree, first_seg(lv)->pool_metadata_lv, origin_only))
+               if (!_add_lv_to_dtree(dm, dtree, seg->pool_metadata_lv, origin_only))
                        return_0;
                /* FIXME code from _create_partial_dtree() should be moved here */
-               if (!_add_lv_to_dtree(dm, dtree, seg_lv(first_seg(lv), 0), origin_only))
+               if (!_add_lv_to_dtree(dm, dtree, seg_lv(seg, 0), origin_only))
                        return_0;
-       } else if (lv_is_thin_volume(lv)) {
-               if (!_add_lv_to_dtree(dm, dtree, first_seg(lv)->pool_lv, origin_only))
+               if (!_add_dev_to_dtree(dm, dtree, lv, "tpool"))
                        return_0;
-       }
+       } else if (lv_is_thin_volume(lv) &&
+                  !_add_lv_to_dtree(dm, dtree, seg->pool_lv, origin_only))
+               return_0;
 
        return 1;
 }