]> sourceware.org Git - lvm2.git/commitdiff
Explicitely check list size of segments
authorZdenek Kabelac <zkabelac@redhat.com>
Tue, 28 Feb 2012 10:08:20 +0000 (10:08 +0000)
committerZdenek Kabelac <zkabelac@redhat.com>
Tue, 28 Feb 2012 10:08:20 +0000 (10:08 +0000)
instead of checking for NULL from last_seg and first_seg.

lib/metadata/lv_manip.c

index 529642291359165f9636ace28f0950ad0978aecd..82f3c65f9e4f97d660d5007db258f8e46cefdc09 100644 (file)
@@ -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;
This page took 0.033403 seconds and 5 git commands to generate.