X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fpartitions%2Fibm.c;h=d59dcbf2bd4a33dadaff4098cf39b24f0cb65aa1;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=a230fa7fefe2d98cf494b74de2ac33b9130d0f60;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/fs/partitions/ibm.c b/fs/partitions/ibm.c
index a230fa7fe..d59dcbf2b 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
 		 */