Messages in this thread Patch in this message | | | From | Philippe De Muyter <> | Subject | [PATCH v2] block/partition/msdos: detect AIX formatted disks even without 55aa | Date | Fri, 25 Jan 2013 16:51:08 +0100 |
| |
AIX formatted disks do not always have the MSDOS 55aa signature. This happens e.g. for unbootable AIX disks.
Up to now, such disks were not recognized as AIX disks, because of the missing 55aa. Fix that by inverting the two tests. Let's first check for the AIX magic strings, and only if that fails check for the MSDOS magic word.
Signed-off-by: Philippe De Muyter <phdm@macqel.be> --- block/partitions/msdos.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
v2: add a comment to avoid accidental removal of the tests order (suggested by Andreas Mohr <andi@lisas.de>)
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c index 8752a5d..7681cd2 100644 --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c @@ -455,14 +455,19 @@ int msdos_partition(struct parsed_partitions *state) data = read_part_sector(state, 0, §); if (!data) return -1; - if (!msdos_magic_present(data + 510)) { + + /* + * Note order! (some AIX disks, e.g. unbootable kind, + * have no MSDOS 55aa) + */ + if (aix_magic_present(state, data)) { put_dev_sector(sect); + strlcat(state->pp_buf, " [AIX]", PAGE_SIZE); return 0; } - if (aix_magic_present(state, data)) { + if (!msdos_magic_present(data + 510)) { put_dev_sector(sect); - strlcat(state->pp_buf, " [AIX]", PAGE_SIZE); return 0; } -- 1.7.1
| |