diff options
author | Christoph Hellwig <hch@lst.de> | 2017-06-03 03:38:06 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-06-09 11:27:32 -0400 |
commit | 4e4cbee93d56137ebff722be022cae5f70ef84fb (patch) | |
tree | 4fa7345155599fc6bdd653fca8c5224ddf90a5be /fs/ext4/readpage.c | |
parent | fc17b6534eb8395f0b3133eb31d87deec32c642b (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 'fs/ext4/readpage.c')
-rw-r--r-- | fs/ext4/readpage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index a81b829d56de..40a5497b0f60 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c | |||
@@ -73,7 +73,7 @@ static void mpage_end_io(struct bio *bio) | |||
73 | int i; | 73 | int i; |
74 | 74 | ||
75 | if (ext4_bio_encrypted(bio)) { | 75 | if (ext4_bio_encrypted(bio)) { |
76 | if (bio->bi_error) { | 76 | if (bio->bi_status) { |
77 | fscrypt_release_ctx(bio->bi_private); | 77 | fscrypt_release_ctx(bio->bi_private); |
78 | } else { | 78 | } else { |
79 | fscrypt_decrypt_bio_pages(bio->bi_private, bio); | 79 | fscrypt_decrypt_bio_pages(bio->bi_private, bio); |
@@ -83,7 +83,7 @@ static void mpage_end_io(struct bio *bio) | |||
83 | bio_for_each_segment_all(bv, bio, i) { | 83 | bio_for_each_segment_all(bv, bio, i) { |
84 | struct page *page = bv->bv_page; | 84 | struct page *page = bv->bv_page; |
85 | 85 | ||
86 | if (!bio->bi_error) { | 86 | if (!bio->bi_status) { |
87 | SetPageUptodate(page); | 87 | SetPageUptodate(page); |
88 | } else { | 88 | } else { |
89 | ClearPageUptodate(page); | 89 | ClearPageUptodate(page); |