diff options
author | Andrew Morton <akpm@osdl.org> | 2005-05-06 20:41:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-07 01:09:27 -0400 |
commit | b2411dd202e854d1f3be541135af8bb9872ea8b6 (patch) | |
tree | 1f13322150e903b03225362f77ec51887d3cc9ca | |
parent | cccf25087f1cb24344b2140ca319b4afe4cf79a8 (diff) |
[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>
-rw-r--r-- | fs/partitions/msdos.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 17ee1b4ff087..584a27b2bbd5 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c | |||
@@ -114,9 +114,6 @@ parse_extended(struct parsed_partitions *state, struct block_device *bdev, | |||
114 | */ | 114 | */ |
115 | for (i=0; i<4; i++, p++) { | 115 | for (i=0; i<4; i++, p++) { |
116 | u32 offs, size, next; | 116 | u32 offs, size, next; |
117 | |||
118 | if (SYS_IND(p) == 0) | ||
119 | continue; | ||
120 | if (!NR_SECTS(p) || is_extended_partition(p)) | 117 | if (!NR_SECTS(p) || is_extended_partition(p)) |
121 | continue; | 118 | continue; |
122 | 119 | ||
@@ -433,8 +430,6 @@ int msdos_partition(struct parsed_partitions *state, struct block_device *bdev) | |||
433 | for (slot = 1 ; slot <= 4 ; slot++, p++) { | 430 | for (slot = 1 ; slot <= 4 ; slot++, p++) { |
434 | u32 start = START_SECT(p)*sector_size; | 431 | u32 start = START_SECT(p)*sector_size; |
435 | u32 size = NR_SECTS(p)*sector_size; | 432 | u32 size = NR_SECTS(p)*sector_size; |
436 | if (SYS_IND(p) == 0) | ||
437 | continue; | ||
438 | if (!size) | 433 | if (!size) |
439 | continue; | 434 | continue; |
440 | if (is_extended_partition(p)) { | 435 | if (is_extended_partition(p)) { |