diff options
Diffstat (limited to 'mm/page_io.c')
-rw-r--r-- | mm/page_io.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index dbffec0d78c9..3b97f6850273 100644 --- a/mm/page_io.c +++ b/mm/page_io.c | |||
@@ -44,14 +44,11 @@ static struct bio *get_swap_bio(gfp_t gfp_flags, pgoff_t index, | |||
44 | return bio; | 44 | return bio; |
45 | } | 45 | } |
46 | 46 | ||
47 | static int end_swap_bio_write(struct bio *bio, unsigned int bytes_done, int err) | 47 | static void end_swap_bio_write(struct bio *bio, int err) |
48 | { | 48 | { |
49 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); | 49 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); |
50 | struct page *page = bio->bi_io_vec[0].bv_page; | 50 | struct page *page = bio->bi_io_vec[0].bv_page; |
51 | 51 | ||
52 | if (bio->bi_size) | ||
53 | return 1; | ||
54 | |||
55 | if (!uptodate) { | 52 | if (!uptodate) { |
56 | SetPageError(page); | 53 | SetPageError(page); |
57 | /* | 54 | /* |
@@ -71,17 +68,13 @@ static int end_swap_bio_write(struct bio *bio, unsigned int bytes_done, int err) | |||
71 | } | 68 | } |
72 | end_page_writeback(page); | 69 | end_page_writeback(page); |
73 | bio_put(bio); | 70 | bio_put(bio); |
74 | return 0; | ||
75 | } | 71 | } |
76 | 72 | ||
77 | int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err) | 73 | void end_swap_bio_read(struct bio *bio, int err) |
78 | { | 74 | { |
79 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); | 75 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); |
80 | struct page *page = bio->bi_io_vec[0].bv_page; | 76 | struct page *page = bio->bi_io_vec[0].bv_page; |
81 | 77 | ||
82 | if (bio->bi_size) | ||
83 | return 1; | ||
84 | |||
85 | if (!uptodate) { | 78 | if (!uptodate) { |
86 | SetPageError(page); | 79 | SetPageError(page); |
87 | ClearPageUptodate(page); | 80 | ClearPageUptodate(page); |
@@ -94,7 +87,6 @@ int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err) | |||
94 | } | 87 | } |
95 | unlock_page(page); | 88 | unlock_page(page); |
96 | bio_put(bio); | 89 | bio_put(bio); |
97 | return 0; | ||
98 | } | 90 | } |
99 | 91 | ||
100 | /* | 92 | /* |