vserver 1.9.3

[linux-2.6.git] / fs / partitions / msdos.c

diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c
index e98505b..ff77a95 100644 (file)
--- a/fs/partitions/msdos.c
+++ b/fs/partitions/msdos.c
@@ -246,6 +246,9 @@ parse_bsd(struct parsed_partitions *state, struct block_device *bdev,
                put_partition(state, state->next++, bsd_start, bsd_size);
        }
        put_dev_sector(sect);
+       if (le16_to_cpu(l->d_npartitions) > max_partitions)
+               printk(" (ignored %d more)",
+                      le16_to_cpu(l->d_npartitions) - max_partitions);
        printk(" >\n");
 }
 #endif
@@ -422,8 +425,8 @@ int msdos_partition(struct parsed_partitions *state, struct block_device *bdev)
         * On the second pass look inside *BSD, Unixware and Solaris partitions.
         */
 
-       state->next = DOS_EXTENDED_PARTITION;
-       for (slot = 1 ; slot < DOS_EXTENDED_PARTITION ; slot++, p++) {
+       state->next = 5;
+       for (slot = 1 ; slot <= 4 ; slot++, p++) {
                u32 start = START_SECT(p)*sector_size;
                u32 size = NR_SECTS(p)*sector_size;
                if (!size)
@@ -450,7 +453,7 @@ int msdos_partition(struct parsed_partitions *state, struct block_device *bdev)
 
        /* second pass - output for each on a separate line */
        p = (struct partition *) (0x1be + data);
-       for (slot = 1 ; slot < DOS_EXTENDED_PARTITION ; slot++, p++) {
+       for (slot = 1 ; slot <= 4 ; slot++, p++) {
                unsigned char id = SYS_IND(p);
                int n;