f2fs: fix to spread clear_cold_data()
[ Upstream commit 2baf07818549c8bb8d7b3437e889b86eab56d38e ] We need to drop PG_checked flag on page as well when we clear PG_uptodate flag, in order to avoid treating the page as GCing one later. Signed-off-by: Weichao Guo <guoweichao@huawei.com> Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
da8d6eac99
commit
02fe0b2173
|
@ -1201,6 +1201,7 @@ int do_write_data_page(struct f2fs_io_info *fio)
|
|||
/* This page is already truncated */
|
||||
if (fio->old_blkaddr == NULL_ADDR) {
|
||||
ClearPageUptodate(page);
|
||||
clear_cold_data(page);
|
||||
goto out_writepage;
|
||||
}
|
||||
|
||||
|
@ -1337,8 +1338,10 @@ done:
|
|||
clear_cold_data(page);
|
||||
out:
|
||||
inode_dec_dirty_pages(inode);
|
||||
if (err)
|
||||
if (err) {
|
||||
ClearPageUptodate(page);
|
||||
clear_cold_data(page);
|
||||
}
|
||||
|
||||
if (wbc->for_reclaim) {
|
||||
f2fs_submit_merged_bio_cond(sbi, NULL, page, 0, DATA, WRITE);
|
||||
|
@ -1821,6 +1824,8 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset,
|
|||
inode_dec_dirty_pages(inode);
|
||||
}
|
||||
|
||||
clear_cold_data(page);
|
||||
|
||||
/* This is atomic written page, keep Private */
|
||||
if (IS_ATOMIC_WRITTEN_PAGE(page))
|
||||
return;
|
||||
|
@ -1839,6 +1844,7 @@ int f2fs_release_page(struct page *page, gfp_t wait)
|
|||
if (IS_ATOMIC_WRITTEN_PAGE(page))
|
||||
return 0;
|
||||
|
||||
clear_cold_data(page);
|
||||
set_page_private(page, 0);
|
||||
ClearPagePrivate(page);
|
||||
return 1;
|
||||
|
|
|
@ -772,6 +772,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
|
|||
clear_page_dirty_for_io(page);
|
||||
ClearPagePrivate(page);
|
||||
ClearPageUptodate(page);
|
||||
clear_cold_data(page);
|
||||
inode_dec_dirty_pages(dir);
|
||||
}
|
||||
f2fs_put_page(page, 1);
|
||||
|
|
|
@ -227,8 +227,10 @@ static int __revoke_inmem_pages(struct inode *inode,
|
|||
}
|
||||
next:
|
||||
/* we don't need to invalidate this in the sccessful status */
|
||||
if (drop || recover)
|
||||
if (drop || recover) {
|
||||
ClearPageUptodate(page);
|
||||
clear_cold_data(page);
|
||||
}
|
||||
set_page_private(page, 0);
|
||||
ClearPagePrivate(page);
|
||||
f2fs_put_page(page, 1);
|
||||
|
|
Loading…
Reference in New Issue