diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2011-11-15 17:25:05 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2011-11-15 17:25:05 +0000 |
| commit | 3de08fc9def40d73bad7a306f2cfd88a1f89948b (patch) | |
| tree | 5b57f0911641e83f092eb0eaa69e943800099b3d /lib/activate | |
| parent | 25de8ca372f2b91d2b78d12ba99a5e086d9963c7 (diff) | |
| download | lvm2-3de08fc9def40d73bad7a306f2cfd88a1f89948b.tar.gz lvm2-3de08fc9def40d73bad7a306f2cfd88a1f89948b.tar.xz lvm2-3de08fc9def40d73bad7a306f2cfd88a1f89948b.zip | |
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).
Diffstat (limited to 'lib/activate')
| -rw-r--r-- | lib/activate/dev_manager.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index b15402e5..4f7e6acb 100644 --- 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; } |