Subject: [folded-merged] partitions-add-aix-lvm-partition-support-files-v2.patch removed from -mm tree To: phdm@xxxxxxxxx,axboe@xxxxxxxxx,kzak@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 08 Jul 2013 15:32:18 -0700 The patch titled Subject: partitions-add-aix-lvm-partition-support-files-v2 has been removed from the -mm tree. Its filename was partitions-add-aix-lvm-partition-support-files-v2.patch This patch was dropped because it was folded into partitions-add-aix-lvm-partition-support-files.patch ------------------------------------------------------ From: Philippe De Muyter <phdm@xxxxxxxxx> Subject: 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@xxxxxxxxx> Cc: Karel Zak <kzak@xxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- block/partitions/aix.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -puN block/partitions/aix.c~partitions-add-aix-lvm-partition-support-files-v2 block/partitions/aix.c --- a/block/partitions/aix.c~partitions-add-aix-lvm-partition-support-files-v2 +++ a/block/partitions/aix.c @@ -257,12 +257,13 @@ int aix_partition(struct parsed_partitio 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]; _ Patches currently in -mm which might be from phdm@xxxxxxxxx are partitions-msdosc-end-of-line-whitespace-and-semicolon-cleanup.patch partitions-add-aix-lvm-partition-support-files.patch partitions-add-aix-lvm-partition-support-files-checkpatch-fixes.patch partitions-add-aix-lvm-partition-support-files-compile-aixc-if-configured.patch partitions-add-aix-lvm-partition-support-files-add-the-aix_partition-entry.patch partitions-msdos-enumerate-also-aix-lvm-partitions.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html