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/block/loop.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/block/loop.c')
-rw-r--r-- | drivers/block/loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 9f015fce4135..b9233a06934c 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
@@ -551,7 +551,7 @@ static int loop_make_request(struct request_queue *q, struct bio *old_bio) | |||
551 | 551 | ||
552 | out: | 552 | out: |
553 | spin_unlock_irq(&lo->lo_lock); | 553 | spin_unlock_irq(&lo->lo_lock); |
554 | bio_io_error(old_bio, old_bio->bi_size); | 554 | bio_io_error(old_bio); |
555 | return 0; | 555 | return 0; |
556 | } | 556 | } |
557 | 557 | ||
@@ -580,7 +580,7 @@ static inline void loop_handle_bio(struct loop_device *lo, struct bio *bio) | |||
580 | bio_put(bio); | 580 | bio_put(bio); |
581 | } else { | 581 | } else { |
582 | int ret = do_bio_filebacked(lo, bio); | 582 | int ret = do_bio_filebacked(lo, bio); |
583 | bio_endio(bio, bio->bi_size, ret); | 583 | bio_endio(bio, ret); |
584 | } | 584 | } |
585 | } | 585 | } |
586 | 586 | ||