diff options
Diffstat (limited to 'mm/highmem.c')
| -rw-r--r-- | mm/highmem.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 3abe1c093efb..acb7ced9b03b 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -288,11 +288,11 @@ static inline void copy_to_high_bio_irq(struct bio *to, struct bio *from) } } -static inline int bounce_end_io (struct bio *bio, int nr_sectors, mempool_t *pool) +static inline void bounce_end_io(struct bio *bio, mempool_t *pool) { struct bio *bio_orig = bio->bi_private; struct bio_vec *bvec, *org_vec; - int ret, i; + int i; if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) goto out_eio; @@ -311,41 +311,38 @@ static inline int bounce_end_io (struct bio *bio, int nr_sectors, mempool_t *poo } out_eio: - ret = bio_orig->bi_end_io(bio_orig, nr_sectors); - + bio_orig->bi_end_io(bio_orig); bio_put(bio); - return ret; } -static int bounce_end_io_write(struct bio *bio, int nr_sectors) +static void bounce_end_io_write(struct bio *bio) { - return bounce_end_io(bio, nr_sectors, page_pool); + bounce_end_io(bio, page_pool); } -static int bounce_end_io_write_isa(struct bio *bio, int nr_sectors) +static void bounce_end_io_write_isa(struct bio *bio) { - return bounce_end_io(bio, nr_sectors, isa_page_pool); + bounce_end_io(bio, isa_page_pool); } -static inline int __bounce_end_io_read(struct bio *bio, int nr_sectors, - mempool_t *pool) +static inline void __bounce_end_io_read(struct bio *bio, mempool_t *pool) { struct bio *bio_orig = bio->bi_private; if (test_bit(BIO_UPTODATE, &bio->bi_flags)) copy_to_high_bio_irq(bio_orig, bio); - return bounce_end_io(bio, nr_sectors, pool); + bounce_end_io(bio, pool); } -static int bounce_end_io_read(struct bio *bio, int nr_sectors) +static void bounce_end_io_read(struct bio *bio) { - return __bounce_end_io_read(bio, nr_sectors, page_pool); + __bounce_end_io_read(bio, page_pool); } -static int bounce_end_io_read_isa(struct bio *bio, int nr_sectors) +static void bounce_end_io_read_isa(struct bio *bio) { - return __bounce_end_io_read(bio, nr_sectors, isa_page_pool); + return __bounce_end_io_read(bio, isa_page_pool); } void create_bounce(unsigned long pfn, int gfp, struct bio **bio_orig) |