* - msdos-partitions-fix-logic-error-in-aix-detection.patch removed from -mm tree
@ 2007-02-11 22:53 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2007-02-11 22:53 UTC (permalink / raw)
To: olh, anton, hirofumi, mm-commits
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@suse.de>
Correct the AIX magic check to let 'echo > /dev/sdb' actually work.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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@suse.de are
origin.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-02-11 22:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-11 22:53 - msdos-partitions-fix-logic-error-in-aix-detection.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.