From 0475b86268597c3d4bcd5bbf20b372c355005bae Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 28 Feb 2012 10:08:20 +0000 Subject: Explicitely check list size of segments instead of checking for NULL from last_seg and first_seg. --- lib/metadata/lv_manip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/metadata/lv_manip.c') diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 52964229..82f3c65f 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -2093,7 +2093,8 @@ int lv_add_virtual_segment(struct logical_volume *lv, uint64_t status, } } - if ((seg = last_seg(lv)) && (seg->segtype == segtype)) { + if (!dm_list_empty(&lv->segments) && + (seg = last_seg(lv)) && (seg->segtype == segtype)) { seg->area_len += extents; seg->len += extents; } else { @@ -2411,7 +2412,7 @@ static int _lv_insert_empty_sublvs(struct logical_volume *lv, char img_name[len]; struct lv_segment *mapseg; - if (lv->le_count || first_seg(lv)) { + if (lv->le_count || !dm_list_empty(&lv->segments)) { log_error(INTERNAL_ERROR "Non-empty LV passed to _lv_insert_empty_sublv"); return 0; -- cgit