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@macqel.be>
Cc: Karel Zak <kzak@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c
index 9bf19e6fd949db9a7762befd7a454a7526144192..9123f250b425170b325943c351f0c34fac3562ff 100644 (file)
--- a/block/partitions/msdos.c
+++ b/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_partitions *state)
         */
        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)) {