[PATCH] Fix check_partition routines
check_partition() stops its probe once it hits an I/O error from the partition checkers. This would prevent the actual partition checker getting a chance to verify the partition. So this patch lets check_partition() continue probing untill it hits a success while recording the I/O error which might have been reported by the checking routines. Also, it does some cleanup of the partition methods for ibm, atari and amiga to return -1 upon hitting an I/O error. Signed-off-by: Suzuki K P <suzuki@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
5127d002f9
commit
57881dd9df
@ -153,7 +153,7 @@ static struct parsed_partitions *
|
||||
check_partition(struct gendisk *hd, struct block_device *bdev)
|
||||
{
|
||||
struct parsed_partitions *state;
|
||||
int i, res;
|
||||
int i, res, err;
|
||||
|
||||
state = kmalloc(sizeof(struct parsed_partitions), GFP_KERNEL);
|
||||
if (!state)
|
||||
@ -165,13 +165,24 @@ check_partition(struct gendisk *hd, struct block_device *bdev)
|
||||
sprintf(state->name, "p");
|
||||
|
||||
state->limit = hd->minors;
|
||||
i = res = 0;
|
||||
i = res = err = 0;
|
||||
while (!res && check_part[i]) {
|
||||
memset(&state->parts, 0, sizeof(state->parts));
|
||||
res = check_part[i++](state, bdev);
|
||||
if (res < 0) {
|
||||
/* We have hit an I/O error which we don't report now.
|
||||
* But record it, and let the others do their job.
|
||||
*/
|
||||
err = res;
|
||||
res = 0;
|
||||
}
|
||||
|
||||
}
|
||||
if (res > 0)
|
||||
return state;
|
||||
if (!err)
|
||||
/* The partition is unrecognized. So report I/O errors if there were any */
|
||||
res = err;
|
||||
if (!res)
|
||||
printk(" unknown partition table\n");
|
||||
else if (warn_no_part)
|
||||
|
Reference in New Issue
Block a user