Subject: [merged] partitions-msdos-enumerate-also-aix-lvm-partitions.patch removed from -mm tree
To: phdm@xxxxxxxxx,axboe@xxxxxxxxx,kzak@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 09 Jul 2013 16:22:07 -0700
The patch titled
Subject: partitions/msdos: enumerate also AIX LVM partitions
has been removed from the -mm tree. Its filename was
partitions-msdos-enumerate-also-aix-lvm-partitions.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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
origin.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
