diff options
| author | Jens Axboe <axboe@burns.home.kernel.dk> | 2002-02-11 16:05:59 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@burns.home.kernel.dk> | 2002-02-11 16:05:59 +0100 |
| commit | 5e5bffab7ca95fd82f13cf4a99a82f333d6e9fb7 (patch) | |
| tree | 0e28d5d56472247fa7203edd3ce4095ac79a7e79 /drivers/block/loop.c | |
| parent | 14d39718ea2be95cc7197c8c94bf56142d0a306c (diff) | |
bio_endio doesn't take nr_sectors argument anymore.
Diffstat (limited to 'drivers/block/loop.c')
| -rw-r--r-- | drivers/block/loop.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 49af2991a968..eb1f8813b421 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -319,7 +319,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) return ret; } -static int loop_end_io_transfer(struct bio *, int); +static void loop_end_io_transfer(struct bio *); static void loop_put_buffer(struct bio *bio) { /* @@ -377,21 +377,19 @@ static struct bio *loop_get_bio(struct loop_device *lo) * bi_end_io context (we don't want to do decrypt of a page with irqs * disabled) */ -static int loop_end_io_transfer(struct bio *bio, int nr_sectors) +static void loop_end_io_transfer(struct bio *bio) { struct bio *rbh = bio->bi_private; struct loop_device *lo = &loop_dev[minor(rbh->bi_dev)]; int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); if (!uptodate || bio_rw(bio) == WRITE) { - bio_endio(rbh, uptodate, nr_sectors); + bio_endio(rbh, uptodate); if (atomic_dec_and_test(&lo->lo_pending)) up(&lo->lo_bh_mutex); loop_put_buffer(bio); } else loop_add_bio(lo, bio); - - return 0; } static struct bio *loop_get_buffer(struct loop_device *lo, struct bio *rbh) @@ -511,13 +509,13 @@ static inline void loop_handle_bio(struct loop_device *lo, struct bio *bio) */ if (lo->lo_flags & LO_FLAGS_DO_BMAP) { ret = do_bio_filebacked(lo, bio); - bio_endio(bio, !ret, bio_sectors(bio)); + bio_endio(bio, !ret); } else { struct bio *rbh = bio->bi_private; ret = do_bio_blockbacked(lo, bio, rbh); - bio_endio(rbh, !ret, bio_sectors(rbh)); + bio_endio(rbh, !ret); loop_put_buffer(bio); } } |