Subject: + partitions-msdos-enumerate-also-aix-lvm-partitions.patch added to -mm tree To: phdm@xxxxxxxxx,axboe@xxxxxxxxx,kzak@xxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 20 May 2013 16:42:09 -0700 The patch titled Subject: partitions/msdos: enumerate also AIX LVM partitions has been added to the -mm tree. Its filename is partitions-msdos-enumerate-also-aix-lvm-partitions.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Philippe De Muyter <phdm@xxxxxxxxx> Subject: partitions/msdos: enumerate also AIX LVM partitions Graft AIX partitions enumeration into partitions/msdos.c There is already a AIX disks detection logic in msdos.c. When an AIX disk has been found, and if configured to, call the aix partitions recognizer. This avoids removal of AIX disks protection from msdos.c, avoids code duplication, and ensures that AIX partitions enumeration is called before plain msdos partitions enumeration. 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/msdos.c | 5 +++++ 1 file changed, 5 insertions(+) diff -puN block/partitions/msdos.c~partitions-msdos-enumerate-also-aix-lvm-partitions block/partitions/msdos.c --- a/block/partitions/msdos.c~partitions-msdos-enumerate-also-aix-lvm-partitions +++ a/block/partitions/msdos.c @@ -23,6 +23,7 @@ #include "check.h" #include "msdos.h" #include "efi.h" +#include "aix.h" /* * Many architectures don't like unaligned accesses, while @@ -462,8 +463,12 @@ int msdos_partition(struct parsed_partit */ if (aix_magic_present(state, data)) { put_dev_sector(sect); +#ifdef CONFIG_AIX_PARTITION + return aix_partition(state); +#else strlcat(state->pp_buf, " [AIX]", PAGE_SIZE); return 0; +#endif } if (!msdos_magic_present(data + 510)) { _ 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-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