The patch titled
msdos partitions: fix logic error in AIX detection
has been removed from the -mm tree. Its filename was
msdos-partitions-fix-logic-error-in-aix-detection.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: msdos partitions: fix logic error in AIX detection
From: Olaf Hering <olh@xxxxxxx>
Correct the AIX magic check to let 'echo > /dev/sdb' actually work.
Signed-off-by: Olaf Hering <olh@xxxxxxx>
Cc: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Cc: Anton Blanchard <anton@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/partitions/msdos.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN fs/partitions/msdos.c~msdos-partitions-fix-logic-error-in-aix-detection fs/partitions/msdos.c
--- a/fs/partitions/msdos.c~msdos-partitions-fix-logic-error-in-aix-detection
+++ a/fs/partitions/msdos.c
@@ -68,10 +68,10 @@ static int aix_magic_present(unsigned ch
unsigned char *d;
int slot, ret = 0;
- if (p[0] != AIX_LABEL_MAGIC1 &&
- p[1] != AIX_LABEL_MAGIC2 &&
- p[2] != AIX_LABEL_MAGIC3 &&
- p[3] != AIX_LABEL_MAGIC4)
+ if (!(p[0] == AIX_LABEL_MAGIC1 &&
+ p[1] == AIX_LABEL_MAGIC2 &&
+ p[2] == AIX_LABEL_MAGIC3 &&
+ p[3] == AIX_LABEL_MAGIC4))
return 0;
/* Assume the partition table is valid if Linux partitions exists */
for (slot = 1; slot <= 4; slot++, pt++) {
_
Patches currently in -mm which might be from olh@xxxxxxx 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
