aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPhilippe De Muyter <phdm@macqel.be>2013-07-08 16:01:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 10:33:28 -0700
commitf8f066033b015a744065f6c7ed83741b4760376b (patch)
treeea2172921280dfd1a8fff3b5bc41141bb5e3b6df /block
parent6ceea22bbbc84fcf6bf0913bb3db8a657e9002f6 (diff)
downloadlinux-linaro-stable-f8f066033b015a744065f6c7ed83741b4760376b.tar.gz
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>
Diffstat (limited to 'block')
-rw-r--r--block/partitions/msdos.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c
index 9bf19e6fd949..9123f250b425 100644
--- 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)) {