diff options
| author |   Chao Yu <yuchao0@huawei.com> | 2018-07-27 18:15:16 +0800 |
|---|---|---|
| committer |   Jaegeuk Kim <jaegeuk@kernel.org> | 2018-10-22 17:54:46 -0700 |
| commit | 2baf07818549c8bb8d7b3437e889b86eab56d38e (patch) | |
| tree | be4aeece55742d8544b77783e2b9ea7ec77ddb31 /fs | |
| parent | Revert "f2fs: fix to clear PG_checked flag in set_page_dirty()" (diff) | |
| download | linux-dev-2baf07818549c8bb8d7b3437e889b86eab56d38e.tar.xz linux-dev-2baf07818549c8bb8d7b3437e889b86eab56d38e.zip | |
f2fs: fix to spread clear_cold_data()
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/data.c | 8 | ||||
| -rw-r--r-- | fs/f2fs/dir.c | 1 | ||||
| -rw-r--r-- | fs/f2fs/segment.c | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index bd6434ad3aa0..8a831f17503e 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1816,6 +1816,7 @@ int f2fs_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; } got_it: @@ -1991,8 +1992,10 @@ done: out: inode_dec_dirty_pages(inode); - if (err) + if (err) { ClearPageUptodate(page); + clear_cold_data(page); + } if (wbc->for_reclaim) { f2fs_submit_merged_write_cond(sbi, NULL, page, 0, DATA); @@ -2621,6 +2624,8 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset, } } + clear_cold_data(page); + /* This is atomic written page, keep Private */ if (IS_ATOMIC_WRITTEN_PAGE(page)) return f2fs_drop_inmem_page(inode, page); @@ -2639,6 +2644,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; diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index e02db5db62dc..2ef84b4590ea 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -730,6 +730,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_remove_dirty_inode(dir); } diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 805c8310d7b0..e38b2f69b68e 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -266,8 +266,10 @@ retry: } 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); |