From 7c4e7f18851efd58f1f52621b688c139d2668c97 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Sun, 16 Jun 2024 07:08:25 -0700 Subject: [PATCH] Revert "f2fs: fix to tag gcing flag on page during block migration" This reverts commit 7c972c89457511007dfc933814c06786905e515c. [ 146.693904][ T8878] WARNING: CPU: 2 PID: 8878 at fs/f2fs/segment.c:3335 f2fs_allocate_data_block+0x130/0xd08 panic in: f2fs_write_data_pages -> f2fs_write_multi_pages -> f2fs_write_single_data_page -> f2fs_do_write_data_page -> f2fs_outplace_write_data -> do_write_page -> f2fs_allocate_data_block if (from_gc) { f2fs_bug_on(sbi, GET_SEGNO(sbi, old_blkaddr) == NULL_SEGNO); se = get_seg_entry(sbi, GET_SEGNO(sbi, old_blkaddr)); sanity_check_seg_type(sbi, se->type); f2fs_bug_on(sbi, IS_NODESEG(se->type)); } Bug: 345273844 Bug: 348080443 Change-Id: I62732bbcb37a7864588886b862b590a463b4d1d9 Signed-off-by: Jaegeuk Kim (cherry picked from commit c0618d182a9cfbcfb4435de7c37ed32c44051216) --- fs/f2fs/compress.c | 4 +--- fs/f2fs/file.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 3bd4d7d9844d..5d2b4812762f 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -1034,10 +1034,8 @@ 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, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index d124d070d556..0989b09a2119 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1327,7 +1327,6 @@ 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); @@ -4061,7 +4060,6 @@ 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); }