f2fs: add BUG cases to initiate fsck.f2fs

This patch replaces BUG cases with f2fs_bug_on to remain fsck.f2fs information.
And it implements some void functions to initiate fsck.f2fs too.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index abfbbca63271b365d8696ecc20b994a4d63a2cb3..46586d3d39042e1cc65ac17e2682f32540aef752 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -526,10 +526,10 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)
        /* Update valid block bitmap */
        if (del > 0) {
                if (f2fs_set_bit(offset, se->cur_valid_map))
-                       BUG();
+                       f2fs_bug_on(sbi, 1);
        } else {
                if (!f2fs_clear_bit(offset, se->cur_valid_map))
-                       BUG();
+                       f2fs_bug_on(sbi, 1);
        }
        if (!f2fs_test_bit(offset, se->ckpt_valid_map))
                se->ckpt_valid_blocks += del;

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 793ca27b9c8856d82342d1275509a20342fd4132..d163fc854ac1bfd57539485b8ae331e045cf84a9 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -583,9 +583,41 @@ static inline void check_block_count(struct f2fs_sb_info *sbi,
        BUG_ON(GET_SIT_VBLOCKS(raw_sit) != valid_blocks);
 }
 #else
-#define check_seg_range(sbi, segno)
-#define verify_block_addr(sbi, blk_addr)
-#define check_block_count(sbi, segno, raw_sit)
+static inline void check_seg_range(struct f2fs_sb_info *sbi, unsigned int segno)
+{
+       unsigned int end_segno = SM_I(sbi)->segment_count - 1;
+
+       if (segno > end_segno)
+               sbi->need_fsck = true;
+}
+
+static inline void verify_block_addr(struct f2fs_sb_info *sbi, block_t blk_addr)
+{
+       struct f2fs_sm_info *sm_info = SM_I(sbi);
+       block_t total_blks = sm_info->segment_count << sbi->log_blocks_per_seg;
+       block_t start_addr = sm_info->seg0_blkaddr;
+       block_t end_addr = start_addr + total_blks - 1;
+
+       if (blk_addr < start_addr || blk_addr > end_addr)
+               sbi->need_fsck = true;
+}
+
+/*
+ * Summary block is always treated as an invalid block
+ */
+static inline void check_block_count(struct f2fs_sb_info *sbi,
+               int segno, struct f2fs_sit_entry *raw_sit)
+{
+       unsigned int end_segno = SM_I(sbi)->segment_count - 1;
+
+       /* check segment usage */
+       if (GET_SIT_VBLOCKS(raw_sit) > sbi->blocks_per_seg)
+               sbi->need_fsck = true;
+
+       /* check boundary of a given segment number */
+       if (segno > end_segno)
+               sbi->need_fsck = true;
+}
 #endif
 
 static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi,