diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-02 19:05:00 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-09 16:15:03 -0400 |
commit | 05796763b8d19b48bb4149bfb1aa1a91dd9faee6 (patch) | |
tree | b6c83dc562e3a9d6a10f6cb35241cddb542d9ebc | |
parent | 9850cf4a8908886370b1f15aacf83d291f098c72 (diff) |
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>
-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) | |||
526 | /* Update valid block bitmap */ | 526 | /* Update valid block bitmap */ |
527 | if (del > 0) { | 527 | if (del > 0) { |
528 | if (f2fs_set_bit(offset, se->cur_valid_map)) | 528 | if (f2fs_set_bit(offset, se->cur_valid_map)) |
529 | BUG(); | 529 | f2fs_bug_on(sbi, 1); |
530 | } else { | 530 | } else { |
531 | if (!f2fs_clear_bit(offset, se->cur_valid_map)) | 531 | if (!f2fs_clear_bit(offset, se->cur_valid_map)) |
532 | BUG(); | 532 | f2fs_bug_on(sbi, 1); |
533 | } | 533 | } |
534 | if (!f2fs_test_bit(offset, se->ckpt_valid_map)) | 534 | if (!f2fs_test_bit(offset, se->ckpt_valid_map)) |
535 | se->ckpt_valid_blocks += del; | 535 | 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, | |||
583 | BUG_ON(GET_SIT_VBLOCKS(raw_sit) != valid_blocks); | 583 | BUG_ON(GET_SIT_VBLOCKS(raw_sit) != valid_blocks); |
584 | } | 584 | } |
585 | #else | 585 | #else |
586 | #define check_seg_range(sbi, segno) | 586 | static inline void check_seg_range(struct f2fs_sb_info *sbi, unsigned int segno) |
587 | #define verify_block_addr(sbi, blk_addr) | 587 | { |
588 | #define check_block_count(sbi, segno, raw_sit) | 588 | unsigned int end_segno = SM_I(sbi)->segment_count - 1; |
589 | |||
590 | if (segno > end_segno) | ||
591 | sbi->need_fsck = true; | ||
592 | } | ||
593 | |||
594 | static inline void verify_block_addr(struct f2fs_sb_info *sbi, block_t blk_addr) | ||
595 | { | ||
596 | struct f2fs_sm_info *sm_info = SM_I(sbi); | ||
597 | block_t total_blks = sm_info->segment_count << sbi->log_blocks_per_seg; | ||
598 | block_t start_addr = sm_info->seg0_blkaddr; | ||
599 | block_t end_addr = start_addr + total_blks - 1; | ||
600 | |||
601 | if (blk_addr < start_addr || blk_addr > end_addr) | ||
602 | sbi->need_fsck = true; | ||
603 | } | ||
604 | |||
605 | /* | ||
606 | * Summary block is always treated as an invalid block | ||
607 | */ | ||
608 | static inline void check_block_count(struct f2fs_sb_info *sbi, | ||
609 | int segno, struct f2fs_sit_entry *raw_sit) | ||
610 | { | ||
611 | unsigned int end_segno = SM_I(sbi)->segment_count - 1; | ||
612 | |||
613 | /* check segment usage */ | ||
614 | if (GET_SIT_VBLOCKS(raw_sit) > sbi->blocks_per_seg) | ||
615 | sbi->need_fsck = true; | ||
616 | |||
617 | /* check boundary of a given segment number */ | ||
618 | if (segno > end_segno) | ||
619 | sbi->need_fsck = true; | ||
620 | } | ||
589 | #endif | 621 | #endif |
590 | 622 | ||
591 | static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi, | 623 | static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi, |