diff options
Diffstat (limited to 'fs/f2fs/data.c')
-rw-r--r-- | fs/f2fs/data.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 7c0f6bdf817d..36fe82012a33 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c | |||
@@ -58,12 +58,12 @@ static void f2fs_read_end_io(struct bio *bio) | |||
58 | #ifdef CONFIG_F2FS_FAULT_INJECTION | 58 | #ifdef CONFIG_F2FS_FAULT_INJECTION |
59 | if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO)) { | 59 | if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO)) { |
60 | f2fs_show_injection_info(FAULT_IO); | 60 | f2fs_show_injection_info(FAULT_IO); |
61 | bio->bi_error = -EIO; | 61 | bio->bi_status = BLK_STS_IOERR; |
62 | } | 62 | } |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | if (f2fs_bio_encrypted(bio)) { | 65 | if (f2fs_bio_encrypted(bio)) { |
66 | if (bio->bi_error) { | 66 | if (bio->bi_status) { |
67 | fscrypt_release_ctx(bio->bi_private); | 67 | fscrypt_release_ctx(bio->bi_private); |
68 | } else { | 68 | } else { |
69 | fscrypt_decrypt_bio_pages(bio->bi_private, bio); | 69 | fscrypt_decrypt_bio_pages(bio->bi_private, bio); |
@@ -74,7 +74,7 @@ static void f2fs_read_end_io(struct bio *bio) | |||
74 | bio_for_each_segment_all(bvec, bio, i) { | 74 | bio_for_each_segment_all(bvec, bio, i) { |
75 | struct page *page = bvec->bv_page; | 75 | struct page *page = bvec->bv_page; |
76 | 76 | ||
77 | if (!bio->bi_error) { | 77 | if (!bio->bi_status) { |
78 | if (!PageUptodate(page)) | 78 | if (!PageUptodate(page)) |
79 | SetPageUptodate(page); | 79 | SetPageUptodate(page); |
80 | } else { | 80 | } else { |
@@ -102,14 +102,14 @@ static void f2fs_write_end_io(struct bio *bio) | |||
102 | unlock_page(page); | 102 | unlock_page(page); |
103 | mempool_free(page, sbi->write_io_dummy); | 103 | mempool_free(page, sbi->write_io_dummy); |
104 | 104 | ||
105 | if (unlikely(bio->bi_error)) | 105 | if (unlikely(bio->bi_status)) |
106 | f2fs_stop_checkpoint(sbi, true); | 106 | f2fs_stop_checkpoint(sbi, true); |
107 | continue; | 107 | continue; |
108 | } | 108 | } |
109 | 109 | ||
110 | fscrypt_pullback_bio_page(&page, true); | 110 | fscrypt_pullback_bio_page(&page, true); |
111 | 111 | ||
112 | if (unlikely(bio->bi_error)) { | 112 | if (unlikely(bio->bi_status)) { |
113 | mapping_set_error(page->mapping, -EIO); | 113 | mapping_set_error(page->mapping, -EIO); |
114 | f2fs_stop_checkpoint(sbi, true); | 114 | f2fs_stop_checkpoint(sbi, true); |
115 | } | 115 | } |