Commit a470e18f authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds

[PATCH] msdos partitions: fix logic error in AIX detection

Correct the AIX magic check to let 'echo > /dev/sdb' actually work.
Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Anton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4419d1ac
...@@ -68,10 +68,10 @@ static int aix_magic_present(unsigned char *p, struct block_device *bdev) ...@@ -68,10 +68,10 @@ static int aix_magic_present(unsigned char *p, struct block_device *bdev)
unsigned char *d; unsigned char *d;
int slot, ret = 0; int slot, ret = 0;
if (p[0] != AIX_LABEL_MAGIC1 && if (!(p[0] == AIX_LABEL_MAGIC1 &&
p[1] != AIX_LABEL_MAGIC2 && p[1] == AIX_LABEL_MAGIC2 &&
p[2] != AIX_LABEL_MAGIC3 && p[2] == AIX_LABEL_MAGIC3 &&
p[3] != AIX_LABEL_MAGIC4) p[3] == AIX_LABEL_MAGIC4))
return 0; return 0;
/* Assume the partition table is valid if Linux partitions exists */ /* Assume the partition table is valid if Linux partitions exists */
for (slot = 1; slot <= 4; slot++, pt++) { for (slot = 1; slot <= 4; slot++, pt++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment