Commit 05796763 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

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: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 9850cf4a

fs/f2fs/segment.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -526,10 +526,10 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del) 
	/* Update valid block bitmap */

	/* Update valid block bitmap */

	if (del > 0) {

	if (del > 0) {

		if (f2fs_set_bit(offset, se->cur_valid_map))

		if (f2fs_set_bit(offset, se->cur_valid_map))

			BUG();

			f2fs_bug_on(sbi, 1);

	} else {

	} else {

		if (!f2fs_clear_bit(offset, se->cur_valid_map))

		if (!f2fs_clear_bit(offset, se->cur_valid_map))

			BUG();

			f2fs_bug_on(sbi, 1);

	}

	}

	if (!f2fs_test_bit(offset, se->ckpt_valid_map))

	if (!f2fs_test_bit(offset, se->ckpt_valid_map))

		se->ckpt_valid_blocks += del;

		se->ckpt_valid_blocks += del;

fs/f2fs/segment.h

+35 −3
Original line number Original line Diff line number Diff line
@@ -583,9 +583,41 @@ static inline void check_block_count(struct f2fs_sb_info *sbi, 
	BUG_ON(GET_SIT_VBLOCKS(raw_sit) != valid_blocks);

	BUG_ON(GET_SIT_VBLOCKS(raw_sit) != valid_blocks);

}

}

#else

#else

#define check_seg_range(sbi, segno)

static inline void check_seg_range(struct f2fs_sb_info *sbi, unsigned int segno)

#define verify_block_addr(sbi, blk_addr)

{

#define check_block_count(sbi, segno, raw_sit)

	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

#endif





static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi,

static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi,