diff options
| author | NeilBrown <neilb@suse.de> | 2007-09-27 12:47:43 +0200 | 
|---|---|---|
| committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-10 09:25:57 +0200 | 
| commit | 6712ecf8f648118c3363c142196418f89a510b90 (patch) | |
| tree | 347d39a7d5a7ed96d3b1afecd28de2a0f98b98c9 /drivers/md/linear.c | |
| parent | 5bb23a688b2de23d7765a1dd439d89c038378978 (diff) | |
| download | olio-linux-3.10-6712ecf8f648118c3363c142196418f89a510b90.tar.xz olio-linux-3.10-6712ecf8f648118c3363c142196418f89a510b90.zip  | |
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 17f795c3e0a..550148770bb 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)  	sector_t block;  	if (unlikely(bio_barrier(bio))) { -		bio_endio(bio, bio->bi_size, -EOPNOTSUPP); +		bio_endio(bio, -EOPNOTSUPP);  		return 0;  	} @@ -358,7 +358,7 @@ static int linear_make_request (struct request_queue *q, struct bio *bio)  			bdevname(tmp_dev->rdev->bdev, b),  			(unsigned long long)tmp_dev->size,  		        (unsigned long long)tmp_dev->offset); -		bio_io_error(bio, bio->bi_size); +		bio_io_error(bio);  		return 0;  	}  	if (unlikely(bio->bi_sector + (bio->bi_size >> 9) >  |