]> sourceware.org Git - lvm2.git/commitdiff
Merge adjacent "Missing" segments.
authorAlasdair Kergon <agk@redhat.com>
Wed, 10 Jul 2002 13:54:17 +0000 (13:54 +0000)
committerAlasdair Kergon <agk@redhat.com>
Wed, 10 Jul 2002 13:54:17 +0000 (13:54 +0000)
lib/format1/import-extents.c

index 84791b583f47155060c0b0113017112550b97aa5..13f5d9304d8947f495054955f0adf4bb57c400be 100644 (file)
@@ -226,7 +226,8 @@ static int _read_linear(struct pool *mem, struct lv_map *lvm)
                        seg->len++;
 
                while ((lvm->map[le + seg->len].pv == seg->area[0].pv) &&
-                      (lvm->map[le + seg->len].pe == seg->area[0].pe +
+                      (seg->area[0].pv &&
+                       lvm->map[le + seg->len].pe == seg->area[0].pe +
                        seg->len));
 
                le += seg->len;
@@ -249,7 +250,8 @@ static int _check_stripe(struct lv_map *lvm, struct stripe_segment *seg,
         */
        for (st = 0; st < seg->stripes; st++)
                if ((lvm->map[le + st * len].pv != seg->area[st].pv) ||
-                   (lvm->map[le + st * len].pe != seg->area[st].pe + seg->len))
+                   (seg->area[st].pv &&
+                    lvm->map[le + st * len].pe != seg->area[st].pe + seg->len))
                        return 0;
 
        return 1;
This page took 0.032934 seconds and 5 git commands to generate.