[PATCH] revert msdos partitioning fix

This change from March 3rd causes the partition parsing code to ignore
partitions which have a signature byte of zero.  Turns out that more people
have such partitions than we expected, and their device numbering is coming up
wrong in post-2.6.11 kernels.

So revert the change while we think about the problem a bit more.

Cc: Andries Brouwer <Andries.Brouwer@cwi.nl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c
index 17ee1b4ff087ee060a9e13a1a4bbe889c9623f22..584a27b2bbd5a5cfc4317356a28efb3b42ef427f 100644 (file)
--- a/fs/partitions/msdos.c
+++ b/fs/partitions/msdos.c
@@ -114,9 +114,6 @@ parse_extended(struct parsed_partitions *state, struct block_device *bdev,
                 */
                for (i=0; i<4; i++, p++) {
                        u32 offs, size, next;
-
-                       if (SYS_IND(p) == 0)
-                               continue;
                        if (!NR_SECTS(p) || is_extended_partition(p))
                                continue;
 
@@ -433,8 +430,6 @@ int msdos_partition(struct parsed_partitions *state, struct block_device *bdev)
        for (slot = 1 ; slot <= 4 ; slot++, p++) {
                u32 start = START_SECT(p)*sector_size;
                u32 size = NR_SECTS(p)*sector_size;
-               if (SYS_IND(p) == 0)
-                       continue;
                if (!size)
                        continue;
                if (is_extended_partition(p)) {