summaryrefslogtreecommitdiffstats
path: root/drivers/block/brd.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-07-20 09:29:37 -0400
committerJens Axboe <axboe@fb.com>2015-07-29 10:55:15 -0400
commit4246a0b63bd8f56a1469b12eafeb875b1041a451 (patch)
tree3281bb158d658ef7f208ad380c0ecee600a5ab5e /drivers/block/brd.c
parent0034af036554c39eefd14d835a8ec3496ac46712 (diff)
block: add a bi_error field to struct bio
Currently we have two different ways to signal an I/O error on a BIO: (1) by clearing the BIO_UPTODATE flag (2) by returning a Linux errno value to the bi_end_io callback The first one has the drawback of only communicating a single possible error (-EIO), and the second one has the drawback of not beeing persistent when bios are queued up, and are not passed along from child to parent bio in the ever more popular chaining scenario. Having both mechanisms available has the additional drawback of utterly confusing driver authors and introducing bugs where various I/O submitters only deal with one of them, and the others have to add boilerplate code to deal with both kinds of error returns. So add a new bi_error field to store an errno value directly in struct bio and remove the existing mechanisms to clean all this up. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: NeilBrown <neilb@suse.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/brd.c')
-rw-r--r--drivers/block/brd.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index e573e470bd8a..f9ab74505e69 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -331,14 +331,12 @@ static void brd_make_request(struct request_queue *q, struct bio *bio)
331 struct bio_vec bvec; 331 struct bio_vec bvec;
332 sector_t sector; 332 sector_t sector;
333 struct bvec_iter iter; 333 struct bvec_iter iter;
334 int err = -EIO;
335 334
336 sector = bio->bi_iter.bi_sector; 335 sector = bio->bi_iter.bi_sector;
337 if (bio_end_sector(bio) > get_capacity(bdev->bd_disk)) 336 if (bio_end_sector(bio) > get_capacity(bdev->bd_disk))
338 goto out; 337 goto io_error;
339 338
340 if (unlikely(bio->bi_rw & REQ_DISCARD)) { 339 if (unlikely(bio->bi_rw & REQ_DISCARD)) {
341 err = 0;
342 discard_from_brd(brd, sector, bio->bi_iter.bi_size); 340 discard_from_brd(brd, sector, bio->bi_iter.bi_size);
343 goto out; 341 goto out;
344 } 342 }
@@ -349,15 +347,20 @@ static void brd_make_request(struct request_queue *q, struct bio *bio)
349 347
350 bio_for_each_segment(bvec, bio, iter) { 348 bio_for_each_segment(bvec, bio, iter) {
351 unsigned int len = bvec.bv_len; 349 unsigned int len = bvec.bv_len;
350 int err;
351
352 err = brd_do_bvec(brd, bvec.bv_page, len, 352 err = brd_do_bvec(brd, bvec.bv_page, len,
353 bvec.bv_offset, rw, sector); 353 bvec.bv_offset, rw, sector);
354 if (err) 354 if (err)
355 break; 355 goto io_error;
356 sector += len >> SECTOR_SHIFT; 356 sector += len >> SECTOR_SHIFT;
357 } 357 }
358 358
359out: 359out:
360 bio_endio(bio, err); 360 bio_endio(bio);
361 return;
362io_error:
363 bio_io_error(bio);
361} 364}
362 365
363static int brd_rw_page(struct block_device *bdev, sector_t sector, 366static int brd_rw_page(struct block_device *bdev, sector_t sector,