[patch 7/8] s390: vol1 partition recognition.
From: Carsten Otte <[email protected]>
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 <[email protected]>
diffstat:
fs/partitions/ibm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -urN linux-2.6/fs/partitions/ibm.c linux-2.6-patched/fs/partitions/ibm.c
--- linux-2.6/fs/partitions/ibm.c 2004-12-24 22:35:40.000000000 +0100
+++ linux-2.6-patched/fs/partitions/ibm.c 2005-01-14 19:45:21.000000000 +0100
@@ -114,7 +114,8 @@
}
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
*/