From 8358014d6be8f3cb507d247d6a623e5961f848d0 Mon Sep 17 00:00:00 2001 From: Chao Yu Date: Thu, 15 Dec 2022 14:05:06 +0800 Subject: [PATCH] f2fs: avoid to check PG_error flag After below changes: commit 14db0b3c7b83 ("fscrypt: stop using PG_error to track error status") commit 98dc08bae678 ("fsverity: stop using PG_error to track error status") There is no place in f2fs we will set PG_error flag in page, let's remove other PG_error usage in f2fs, as a step towards freeing the PG_error flag for other uses. Cc: Eric Biggers Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 2 -- fs/f2fs/gc.c | 1 - fs/f2fs/inline.c | 1 - fs/f2fs/node.c | 3 --- fs/f2fs/segment.c | 1 - 5 files changed, 8 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 60fb44a..af906ed 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2701,7 +2701,6 @@ got_it: goto out_writepage; set_page_writeback(page); - ClearPageError(page); f2fs_put_dnode(&dn); if (fio->need_lock == LOCK_REQ) f2fs_unlock_op(fio->sbi); @@ -2737,7 +2736,6 @@ got_it: goto out_writepage; set_page_writeback(page); - ClearPageError(page); if (fio->compr_blocks && fio->old_blkaddr == COMPRESS_ADDR) f2fs_i_compr_blocks_update(inode, fio->compr_blocks - 1, false); diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 83e68ec..7444c39 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -1364,7 +1364,6 @@ static int 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); fio.op = REQ_OP_WRITE; fio.op_flags = REQ_SYNC; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 21a4952..08e302d 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -174,7 +174,6 @@ 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); f2fs_outplace_write_data(dn, &fio); diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index dde4c04..558b318 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1650,7 +1650,6 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted, } set_page_writeback(page); - ClearPageError(page); fio.old_blkaddr = ni.blk_addr; f2fs_do_write_node_page(nid, &fio); @@ -2079,8 +2078,6 @@ int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, spin_unlock_irqrestore(&sbi->fsync_node_lock, flags); f2fs_wait_on_page_writeback(page, NODE, true, false); - if (TestClearPageError(page)) - ret = -EIO; put_page(page); diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 37117cb..a27ffc6 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3422,7 +3422,6 @@ void f2fs_do_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); stat_inc_meta_count(sbi, page->index); -- 2.7.4