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 /fs/xfs/linux-2.6/xfs_aops.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 'fs/xfs/linux-2.6/xfs_aops.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 5f152f60d74d..3f13519436af 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -326,14 +326,10 @@ xfs_iomap_valid( | |||
326 | STATIC int | 326 | STATIC int |
327 | xfs_end_bio( | 327 | xfs_end_bio( |
328 | struct bio *bio, | 328 | struct bio *bio, |
329 | unsigned int bytes_done, | ||
330 | int error) | 329 | int error) |
331 | { | 330 | { |
332 | xfs_ioend_t *ioend = bio->bi_private; | 331 | xfs_ioend_t *ioend = bio->bi_private; |
333 | 332 | ||
334 | if (bio->bi_size) | ||
335 | return 1; | ||
336 | |||
337 | ASSERT(atomic_read(&bio->bi_cnt) >= 1); | 333 | ASSERT(atomic_read(&bio->bi_cnt) >= 1); |
338 | ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error; | 334 | ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error; |
339 | 335 | ||