diff options
| author | Mark Fortescue <mark@mtfhpc.demon.co.uk> | 2007-07-25 18:30:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-30 00:27:28 -0700 |
| commit | b84d879639f83d35d3fcd909222522c928bf974b (patch) | |
| tree | 10ef0162543eca2b6107bd44646133a341777177 /fs/partitions | |
| parent | cce933bc831c451f48ca26e5b0d9bfdfbfb327f8 (diff) | |
| download | linux-b84d879639f83d35d3fcd909222522c928bf974b.tar.gz | |
[PARTITION] MSDOS: Fix Sun num_partitions handling.
Correct the Solaris x86 number of partitions (slices) is a way that is backward compatible with the earlier size. This works without a new VTOC structure definition as the timestamp and v_asciilabel fields in the VTOC are not used by the kernel yet. Signed-off-by: Mark Fortescue <mark@mtfhpc.demon.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/partitions')
| -rw-r--r-- | fs/partitions/msdos.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 4ccec4cd1367..5567ec0d03a3 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c @@ -203,6 +203,7 @@ parse_solaris_x86(struct parsed_partitions *state, struct block_device *bdev, Sector sect; struct solaris_x86_vtoc *v; int i; + short max_nparts; v = (struct solaris_x86_vtoc *)read_dev_sector(bdev, offset+1, §); if (!v) @@ -218,7 +219,9 @@ parse_solaris_x86(struct parsed_partitions *state, struct block_device *bdev, put_dev_sector(sect); return; } - for (i=0; i<SOLARIS_X86_NUMSLICE && state->next<state->limit; i++) { + /* Ensure we can handle previous case of VTOC with 8 entries gracefully */ + max_nparts = le16_to_cpu (v->v_nparts) > 8 ? SOLARIS_X86_NUMSLICE : 8; + for (i=0; i<max_nparts && state->next<state->limit; i++) { struct solaris_x86_slice *s = &v->v_slice[i]; if (s->s_size == 0) continue; |