[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: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fs/partitions/ibm.c

@@ -114,7 +114,8 @@ ibm_partition(struct parsed_partitions *state, struct block_device *bdev)
 		}
 		put_partition(state, 1, 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
 		 */