Revert: "f2fs: check in-memory block bitmap"

Commit 355e78913c0d ("f2fs: check in-memory block bitmap") added
a mirror for valid block bitmap, it expects to detect in-memory
corruption, however we never got any reports from the check points
for almost decade, let's remove the code, it can help to save
memories.

Cc: wallentx <william.allentx@gmail.com>
Suggested-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 1ef4edb770784271181c02adf94fda9d261fe4b4..9926ba9d77bac661deccf954e96b1f6a5dc76093 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2455,9 +2455,6 @@ static int update_sit_entry_for_release(struct f2fs_sb_info *sbi, struct seg_ent
                                unsigned int segno, block_t blkaddr, unsigned int offset, int del)
 {
        bool exist;
-#ifdef CONFIG_F2FS_CHECK_FS
-       bool mir_exist;
-#endif
        int i;
        int del_count = -del;
 
@@ -2465,15 +2462,6 @@ static int update_sit_entry_for_release(struct f2fs_sb_info *sbi, struct seg_ent
 
        for (i = 0; i < del_count; i++) {
                exist = f2fs_test_and_clear_bit(offset + i, se->cur_valid_map);
-#ifdef CONFIG_F2FS_CHECK_FS
-               mir_exist = f2fs_test_and_clear_bit(offset + i,
-                                               se->cur_valid_map_mir);
-               if (unlikely(exist != mir_exist)) {
-                       f2fs_err(sbi, "Inconsistent error when clearing bitmap, blk:%u, old bit:%d",
-                               blkaddr + i, exist);
-                       f2fs_bug_on(sbi, 1);
-               }
-#endif
                if (unlikely(!exist)) {
                        f2fs_err(sbi, "Bitmap was wrongly cleared, blk:%u", blkaddr + i);
                        f2fs_bug_on(sbi, 1);
@@ -2514,20 +2502,8 @@ static int update_sit_entry_for_alloc(struct f2fs_sb_info *sbi, struct seg_entry
                                unsigned int segno, block_t blkaddr, unsigned int offset, int del)
 {
        bool exist;
-#ifdef CONFIG_F2FS_CHECK_FS
-       bool mir_exist;
-#endif
 
        exist = f2fs_test_and_set_bit(offset, se->cur_valid_map);
-#ifdef CONFIG_F2FS_CHECK_FS
-       mir_exist = f2fs_test_and_set_bit(offset,
-                                       se->cur_valid_map_mir);
-       if (unlikely(exist != mir_exist)) {
-               f2fs_err(sbi, "Inconsistent error when setting bitmap, blk:%u, old bit:%d",
-                       blkaddr, exist);
-               f2fs_bug_on(sbi, 1);
-       }
-#endif
        if (unlikely(exist)) {
                f2fs_err(sbi, "Bitmap was wrongly set, blk:%u", blkaddr);
                f2fs_bug_on(sbi, 1);
@@ -4771,11 +4747,6 @@ void f2fs_flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                        int offset, sit_offset;
 
                        se = get_seg_entry(sbi, segno);
-#ifdef CONFIG_F2FS_CHECK_FS
-                       if (memcmp(se->cur_valid_map, se->cur_valid_map_mir,
-                                               SIT_VBLOCK_MAP_SIZE))
-                               f2fs_bug_on(sbi, 1);
-#endif
 
                        /* add discard candidates */
                        if (!(cpc->reason & CP_DISCARD)) {
@@ -4866,11 +4837,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
        if (!sit_i->dirty_sentries_bitmap)
                return -ENOMEM;
 
-#ifdef CONFIG_F2FS_CHECK_FS
-       bitmap_size = MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * (3 + discard_map);
-#else
        bitmap_size = MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * (2 + discard_map);
-#endif
        sit_i->bitmap = f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL);
        if (!sit_i->bitmap)
                return -ENOMEM;
@@ -4884,11 +4851,6 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
                sit_i->sentries[start].ckpt_valid_map = bitmap;
                bitmap += SIT_VBLOCK_MAP_SIZE;
 
-#ifdef CONFIG_F2FS_CHECK_FS
-               sit_i->sentries[start].cur_valid_map_mir = bitmap;
-               bitmap += SIT_VBLOCK_MAP_SIZE;
-#endif
-
                if (discard_map) {
                        sit_i->sentries[start].discard_map = bitmap;
                        bitmap += SIT_VBLOCK_MAP_SIZE;

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 08735a165433cc355bf629d3a223722a09bee89c..38a56b8ab2ccc4f18a0d481861505989f70ca2b4 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -177,9 +177,6 @@ struct seg_entry {
        unsigned int ckpt_valid_blocks:10;      /* # of valid blocks last cp */
        unsigned int padding:6;         /* padding */
        unsigned char *cur_valid_map;   /* validity bitmap of blocks */
-#ifdef CONFIG_F2FS_CHECK_FS
-       unsigned char *cur_valid_map_mir;       /* mirror of current valid bitmap */
-#endif
        /*
         * # of valid blocks and the validity bitmap stored in the last
         * checkpoint pack. This information is used by the SSR mode.
@@ -408,9 +405,6 @@ static inline void seg_info_from_raw_sit(struct seg_entry *se,
        se->ckpt_valid_blocks = GET_SIT_VBLOCKS(rs);
        memcpy(se->cur_valid_map, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
        memcpy(se->ckpt_valid_map, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
-#ifdef CONFIG_F2FS_CHECK_FS
-       memcpy(se->cur_valid_map_mir, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
-#endif
        se->type = GET_SIT_TYPE(rs);
        se->mtime = le64_to_cpu(rs->mtime);
 }