diff options
Diffstat (limited to 'fs/mpage.c')
-rw-r--r-- | fs/mpage.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/mpage.c b/fs/mpage.c index c1698f2291aa..b1c3e5890508 100644 --- a/fs/mpage.c +++ b/fs/mpage.c | |||
@@ -39,14 +39,11 @@ | |||
39 | * status of that page is hard. See end_buffer_async_read() for the details. | 39 | * status of that page is hard. See end_buffer_async_read() for the details. |
40 | * There is no point in duplicating all that complexity. | 40 | * There is no point in duplicating all that complexity. |
41 | */ | 41 | */ |
42 | static int mpage_end_io_read(struct bio *bio, unsigned int bytes_done, int err) | 42 | static void mpage_end_io_read(struct bio *bio, int err) |
43 | { | 43 | { |
44 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); | 44 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); |
45 | struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; | 45 | struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; |
46 | 46 | ||
47 | if (bio->bi_size) | ||
48 | return 1; | ||
49 | |||
50 | do { | 47 | do { |
51 | struct page *page = bvec->bv_page; | 48 | struct page *page = bvec->bv_page; |
52 | 49 | ||
@@ -62,17 +59,13 @@ static int mpage_end_io_read(struct bio *bio, unsigned int bytes_done, int err) | |||
62 | unlock_page(page); | 59 | unlock_page(page); |
63 | } while (bvec >= bio->bi_io_vec); | 60 | } while (bvec >= bio->bi_io_vec); |
64 | bio_put(bio); | 61 | bio_put(bio); |
65 | return 0; | ||
66 | } | 62 | } |
67 | 63 | ||
68 | static int mpage_end_io_write(struct bio *bio, unsigned int bytes_done, int err) | 64 | static void mpage_end_io_write(struct bio *bio, int err) |
69 | { | 65 | { |
70 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); | 66 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); |
71 | struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; | 67 | struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; |
72 | 68 | ||
73 | if (bio->bi_size) | ||
74 | return 1; | ||
75 | |||
76 | do { | 69 | do { |
77 | struct page *page = bvec->bv_page; | 70 | struct page *page = bvec->bv_page; |
78 | 71 | ||
@@ -87,7 +80,6 @@ static int mpage_end_io_write(struct bio *bio, unsigned int bytes_done, int err) | |||
87 | end_page_writeback(page); | 80 | end_page_writeback(page); |
88 | } while (bvec >= bio->bi_io_vec); | 81 | } while (bvec >= bio->bi_io_vec); |
89 | bio_put(bio); | 82 | bio_put(bio); |
90 | return 0; | ||
91 | } | 83 | } |
92 | 84 | ||
93 | static struct bio *mpage_bio_submit(int rw, struct bio *bio) | 85 | static struct bio *mpage_bio_submit(int rw, struct bio *bio) |