diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-02 16:05:00 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-09 13:15:03 -0700 |
| commit | 05796763b8d19b48bb4149bfb1aa1a91dd9faee6 (patch) | |
| tree | b6c83dc562e3a9d6a10f6cb35241cddb542d9ebc /fs/f2fs | |
| parent | 9850cf4a8908886370b1f15aacf83d291f098c72 (diff) | |
| download | linux-05796763b8d19b48bb4149bfb1aa1a91dd9faee6.tar.gz linux-05796763b8d19b48bb4149bfb1aa1a91dd9faee6.tar.bz2 linux-05796763b8d19b48bb4149bfb1aa1a91dd9faee6.zip | |
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>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/segment.c | 4 | ||||
| -rw-r--r-- | fs/f2fs/segment.h | 38 |
2 files changed, 37 insertions, 5 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index abfbbca63271..46586d3d3904 100644 --- 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 793ca27b9c88..d163fc854ac1 100644 --- 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, |