lkml.org 
[lkml]   [2019]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 41/99] f2fs: fix to spread clear_cold_data()
    Date
    From: Chao Yu <yuchao0@huawei.com>

    [ 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>
    ---
    fs/f2fs/data.c | 8 +++++++-
    fs/f2fs/dir.c | 1 +
    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 9041805096e0c..0206c8c20784c 100644
    --- a/fs/f2fs/data.c
    +++ b/fs/f2fs/data.c
    @@ -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 @@ static int f2fs_write_data_page(struct page *page,
    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;
    diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
    index af719d93507e8..b414892be08b7 100644
    --- a/fs/f2fs/dir.c
    +++ b/fs/f2fs/dir.c
    @@ -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);
    diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
    index 1d5a352138109..c4c84af1ec17a 100644
    --- a/fs/f2fs/segment.c
    +++ b/fs/f2fs/segment.c
    @@ -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);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-16 17:04    [W:4.060 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site