diff options
author | NeilBrown <neilb@suse.de> | 2007-09-27 06:47:43 -0400 |
---|---|---|
committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-10 03:25:57 -0400 |
commit | 6712ecf8f648118c3363c142196418f89a510b90 (patch) | |
tree | 347d39a7d5a7ed96d3b1afecd28de2a0f98b98c9 /drivers/md/linear.c | |
parent | 5bb23a688b2de23d7765a1dd439d89c038378978 (diff) |
Drop 'size' argument from bio_endio and bi_end_io
As bi_end_io is only called once when the reqeust is complete,
the 'size' argument is now redundant. Remove it.
Now there is no need for bio_endio to subtract the size completed
from bi_size. So don't do that either.
While we are at it, change bi_end_io to return void.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/md/linear.c')
-rw-r--r-- | drivers/md/linear.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 17f795c3e0ab..550148770bb2 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
@@ -338,7 +338,7 @@ static int linear_make_request (struct request_queue *q, struct bio *bio) | |||
338 | sector_t block; | 338 | sector_t block; |
339 | 339 | ||
340 | if (unlikely(bio_barrier(bio))) { | 340 | if (unlikely(bio_barrier(bio))) { |
341 | bio_endio(bio, bio->bi_size, -EOPNOTSUPP); | 341 | bio_endio(bio, -EOPNOTSUPP); |
342 | return 0; | 342 | return 0; |
343 | } | 343 | } |
344 | 344 | ||
@@ -358,7 +358,7 @@ static int linear_make_request (struct request_queue *q, struct bio *bio) | |||
358 | bdevname(tmp_dev->rdev->bdev, b), | 358 | bdevname(tmp_dev->rdev->bdev, b), |
359 | (unsigned long long)tmp_dev->size, | 359 | (unsigned long long)tmp_dev->size, |
360 | (unsigned long long)tmp_dev->offset); | 360 | (unsigned long long)tmp_dev->offset); |
361 | bio_io_error(bio, bio->bi_size); | 361 | bio_io_error(bio); |
362 | return 0; | 362 | return 0; |
363 | } | 363 | } |
364 | if (unlikely(bio->bi_sector + (bio->bi_size >> 9) > | 364 | if (unlikely(bio->bi_sector + (bio->bi_size >> 9) > |