Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2baf0781 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

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: default avatarWeichao Guo <guoweichao@huawei.com>
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 164a63fa

fs/f2fs/data.c

+7 −1
Original line number Diff line number Diff line
@@ -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 @@ static int __write_data_page(struct page *page, bool *submitted, 


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;

fs/f2fs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

	}

fs/f2fs/segment.c

+3 −1
Original line number Diff line number Diff line
@@ -266,8 +266,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);