summaryrefslogtreecommitdiffstats
path: root/mm/page_io.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-06-03 03:38:06 -0400
committerJens Axboe <axboe@fb.com>2017-06-09 11:27:32 -0400
commit4e4cbee93d56137ebff722be022cae5f70ef84fb (patch)
tree4fa7345155599fc6bdd653fca8c5224ddf90a5be /mm/page_io.c
parentfc17b6534eb8395f0b3133eb31d87deec32c642b (diff)
block: switch bios to blk_status_t
Replace bi_error with a new bi_status to allow for a clear conversion. Note that device mapper overloaded bi_error with a private value, which we'll have to keep arround at least for now and thus propagate to a proper blk_status_t value. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'mm/page_io.c')
-rw-r--r--mm/page_io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_io.c b/mm/page_io.c
index 23f6d0d3470f..2da71e627812 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -45,7 +45,7 @@ void end_swap_bio_write(struct bio *bio)
45{ 45{
46 struct page *page = bio->bi_io_vec[0].bv_page; 46 struct page *page = bio->bi_io_vec[0].bv_page;
47 47
48 if (bio->bi_error) { 48 if (bio->bi_status) {
49 SetPageError(page); 49 SetPageError(page);
50 /* 50 /*
51 * We failed to write the page out to swap-space. 51 * We failed to write the page out to swap-space.
@@ -118,7 +118,7 @@ static void end_swap_bio_read(struct bio *bio)
118{ 118{
119 struct page *page = bio->bi_io_vec[0].bv_page; 119 struct page *page = bio->bi_io_vec[0].bv_page;
120 120
121 if (bio->bi_error) { 121 if (bio->bi_status) {
122 SetPageError(page); 122 SetPageError(page);
123 ClearPageUptodate(page); 123 ClearPageUptodate(page);
124 pr_alert("Read-error on swap-device (%u:%u:%llu)\n", 124 pr_alert("Read-error on swap-device (%u:%u:%llu)\n",