summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPhilippe De Muyter <phdm@macqel.be>2013-06-07 10:09:49 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-06-17 18:20:52 +1000
commitb41c12d269f7d27a47f3d0fabf834c2acdea3f3d (patch)
tree88a094c400c61d9cf2b6bd003a2011e9b687a927 /block
parent747564376cec1102a54d645fbf4dbd436845ae45 (diff)
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>
Diffstat (limited to 'block')
-rw-r--r--block/partitions/aix.c9
1 files changed, 5 insertions, 4 deletions
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];