diff options
author | Neil Brown <neilb@suse.de> | 2007-02-08 17:20:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:25:46 -0500 |
commit | 387bb17374c5fa057462d00d4ba941d49f45de4d (patch) | |
tree | 85c68bbd2f077724563cfb26a3357d6679f12104 /block/ll_rw_blk.c | |
parent | 6649a3863232eb2e2f15ea6c622bd8ceacf96d76 (diff) |
[PATCH] md: fix various bugs with aligned reads in RAID5
It is possible for raid5 to be sent a bio that is too big for an underlying
device. So if it is a READ that we pass stright down to a device, it will
fail and confuse RAID5.
So in 'chunk_aligned_read' we check that the bio fits within the parameters
for the target device and if it doesn't fit, fall back on reading through
the stripe cache and making lots of one-page requests.
Note that this is the earliest time we can check against the device because
earlier we don't have a lock on the device, so it could change underneath
us.
Also, the code for handling a retry through the cache when a read fails has
not been tested and was badly broken. This patch fixes that code.
Signed-off-by: Neil Brown <neilb@suse.de>
Cc: "Kai" <epimetreus@fastmail.fm>
Cc: <stable@suse.de>
Cc: <org@suse.de>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block/ll_rw_blk.c')
-rw-r--r-- | block/ll_rw_blk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index fb6789725e1b..38c293b987b7 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -1264,7 +1264,7 @@ new_hw_segment: | |||
1264 | bio->bi_hw_segments = nr_hw_segs; | 1264 | bio->bi_hw_segments = nr_hw_segs; |
1265 | bio->bi_flags |= (1 << BIO_SEG_VALID); | 1265 | bio->bi_flags |= (1 << BIO_SEG_VALID); |
1266 | } | 1266 | } |
1267 | 1267 | EXPORT_SYMBOL(blk_recount_segments); | |
1268 | 1268 | ||
1269 | static int blk_phys_contig_segment(request_queue_t *q, struct bio *bio, | 1269 | static int blk_phys_contig_segment(request_queue_t *q, struct bio *bio, |
1270 | struct bio *nxt) | 1270 | struct bio *nxt) |