From: Philippe De Muyter <phdm@macqel.be>
Date: Thu, 27 Jun 2013 23:54:08 +0000 (+1000)
Subject: partitions-add-aix-lvm-partition-support-files-v2
X-Git-Tag: next-20130628~3^2~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b175505791940c5ff19eccd6e72a7602976a3779;p=karo-tx-linux.git

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 b3288d24dacf..ef46cf3594f8 100644
--- 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];