partitions-add-aix-lvm-partition-support-files-v2

Fix a problem in the discovering of small (1 pp) partitions in presence of
discontiguous partitions.

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Cc: Karel Zak <kzak@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/block/partitions/aix.c b/block/partitions/aix.c
index b3288d24dacfe50ef3b96036051ab71f40c87f60..ef46cf3594f8d8153ae505fa4607f7625780e15a 100644 (file)
--- a/block/partitions/aix.c
+++ b/block/partitions/aix.c
@@ -257,12 +257,13 @@ int aix_partition(struct parsed_partitions *state)
                                continue;
                        }
                        lvip[lv_ix].pps_found += 1;
-                       if (lp_ix != next_lp_ix)
-                               continue;
-                       if (lp_ix == 1)
+                       if (lp_ix == 1) {
                                cur_lv_ix = lv_ix;
-                       else if (lv_ix != cur_lv_ix)
                                next_lp_ix = 1;
+                       } else if (lv_ix != cur_lv_ix || lp_ix != next_lp_ix) {
+                               next_lp_ix = 1;
+                               continue;
+                       }
                        if (lp_ix == lvip[lv_ix].pps_per_lv) {
                                char tmp[70];