Unverified Commit 23534451 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5250 f2fs: fix to tag gcing flag on page during block migration 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PHS2W7GEPYJHBHMG3W66DVRX54JAFDHU/ 
 
https://gitee.com/src-openeuler/kernel/issues/I96GPF 
 
Link:https://gitee.com/openeuler/kernel/pulls/5250

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 293d9743 56a1ecb9

fs/f2fs/compress.c

+3 −1
Original line number Diff line number Diff line
@@ -1029,8 +1029,10 @@ static void set_cluster_dirty(struct compress_ctx *cc) 
	int i;



	for (i = 0; i < cc->cluster_size; i++)

		if (cc->rpages[i])

		if (cc->rpages[i]) {

			set_page_dirty(cc->rpages[i]);

			set_page_private_gcing(cc->rpages[i]);

		}

}



static int prepare_compress_overwrite(struct compress_ctx *cc,

fs/f2fs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, 
			}

			memcpy_page(pdst, 0, psrc, 0, PAGE_SIZE);

			set_page_dirty(pdst);

			set_page_private_gcing(pdst);

			f2fs_put_page(pdst, 1);

			f2fs_put_page(psrc, 1);
@@ -4054,6 +4055,7 @@ static int redirty_blocks(struct inode *inode, pgoff_t page_idx, int len) 
		f2fs_bug_on(F2FS_I_SB(inode), !page);



		set_page_dirty(page);

		set_page_private_gcing(page);

		f2fs_put_page(page, 1);

		f2fs_put_page(page, 0);

	}