diff options
| author | Carsten Otte <cotte@de.ibm.com> | 2005-01-14 23:33:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:33:16 -0800 |
| commit | 26fdede0d137631c55aeced7d17ae0cc914323dc (patch) | |
| tree | acdbfdeb694df9684ff255621a9764d55c9f8ee0 /fs | |
| parent | 20f9cb264c0ffa0a676ff66632c3d48b83b0106b (diff) | |
| download | history-26fdede0d137631c55aeced7d17ae0cc914323dc.tar.gz | |
[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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/partitions/ibm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/partitions/ibm.c b/fs/partitions/ibm.c index a230fa7fefe2d9..d59dcbf2bd4a33 100644 --- a/fs/partitions/ibm.c +++ b/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 */ |