diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-04-11 23:09:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-05-08 14:41:01 +0000 |
| commit | 9731a2dab47eadf85572b0924c072306bb6c3c5d (patch) | |
| tree | b892222777ed3940e957bd090c26b99bc2927271 | |
| parent | 6a70286b43e22f808929f116b2ceed523bba16e1 (diff) | |
UPSTREAM: f2fs: clear PageError on writepage - part 2ASB-2018-06-05_4.9ASB-2018-05-05_4.9
This patch clears PageError in some pages tagged by read path, but when we
write the pages with valid contents, writepage should clear the bit likewise
ext4.
Change-Id: I434b22132f29f7243ab9170296a6e0b52e40701d
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit f453147e9315b3bc1050b590278a63d91fc2a681)
| -rw-r--r-- | fs/f2fs/gc.c | 1 | ||||
| -rw-r--r-- | fs/f2fs/inline.c | 1 | ||||
| -rw-r--r-- | fs/f2fs/node.c | 1 | ||||
| -rw-r--r-- | fs/f2fs/segment.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 604d3fcb8957..66044faf2b71 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -693,6 +693,7 @@ static void move_data_block(struct inode *inode, block_t bidx, dec_page_count(fio.sbi, F2FS_DIRTY_META); set_page_writeback(fio.encrypted_page); + ClearPageError(page); /* allocate block address */ f2fs_wait_on_page_writeback(dn.node_page, NODE, true); diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 26832e778233..156ac4ff491a 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -157,6 +157,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) /* write data page to try to make data consistent */ set_page_writeback(page); + ClearPageError(page); fio.old_blkaddr = dn->data_blkaddr; set_inode_flag(dn->inode, FI_HOT_DATA); write_data_page(dn, &fio); diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index ccf410af9192..803a0102a47b 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1398,6 +1398,7 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted, fio.op_flags |= REQ_PREFLUSH | REQ_FUA; set_page_writeback(page); + ClearPageError(page); fio.old_blkaddr = ni.blk_addr; write_node_page(nid, &fio); set_node_addr(sbi, &ni, fio.new_blkaddr, is_fsync_dnode(page)); diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index fc4ee3835f1d..bdf567a7f9b7 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2758,6 +2758,7 @@ void write_meta_page(struct f2fs_sb_info *sbi, struct page *page, fio.op_flags &= ~REQ_META; set_page_writeback(page); + ClearPageError(page); f2fs_submit_page_write(&fio); f2fs_update_iostat(sbi, io_type, F2FS_BLKSIZE); |