Commit 26fdede0 authored by Carsten Otte's avatar Carsten Otte Committed by Linus Torvalds

[PATCH] s390: vol1 partition recognition

Make the ECKD compatible disk layout labling detection conditional to run only
on ECKD compatible disk layout volumes, do a fall back into the default
LNX/unlabled case otherwise.
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 20f9cb26
...@@ -114,7 +114,8 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev) ...@@ -114,7 +114,8 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
} }
put_partition(state, 1, offset*(blocksize >> 9), put_partition(state, 1, offset*(blocksize >> 9),
size-offset*(blocksize >> 9)); size-offset*(blocksize >> 9));
} else if (strncmp(type, "VOL1", 4) == 0) { } else if ((strncmp(type, "VOL1", 4) == 0) &&
(!info->FBA_layout) && (!strcmp(info->type, "ECKD"))) {
/* /*
* New style VOL1 labeled disk * New style VOL1 labeled disk
*/ */
......
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