From 6515946e4d72dd600fea5fba9bbbc8c7a2617047 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 20 Jan 2012 10:56:30 +0000 Subject: Thin cleanup Reorder condition so the code is better readable (and shorter). --- lib/metadata/lv.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 302fd4a1..3fd8a38f 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -182,11 +182,10 @@ char *lv_mirror_log_dup(struct dm_pool *mem, const struct logical_volume *lv) { struct lv_segment *seg; - dm_list_iterate_items(seg, &lv->segments) { - if (!seg_is_mirrored(seg) || !seg->log_lv) - continue; - return dm_pool_strdup(mem, seg->log_lv->name); - } + dm_list_iterate_items(seg, &lv->segments) + if (seg_is_mirrored(seg) && seg->log_lv) + return dm_pool_strdup(mem, seg->log_lv->name); + return NULL; } @@ -194,11 +193,10 @@ char *lv_pool_lv_dup(struct dm_pool *mem, const struct logical_volume *lv) { struct lv_segment *seg; - dm_list_iterate_items(seg, &lv->segments) { - if (!seg_is_thin_volume(seg) || !seg->pool_lv) - continue; - return dm_pool_strdup(mem, seg->pool_lv->name); - } + dm_list_iterate_items(seg, &lv->segments) + if (seg_is_thin_volume(seg) && seg->pool_lv) + return dm_pool_strdup(mem, seg->pool_lv->name); + return NULL; } -- cgit