Commit 7e986855 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: fix wrong segment count 



MAIN_SEGS is for data area, while TOTAL_SEGS includes data and metadata.

Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent dda7d77b

fs/f2fs/segment.h

+5 −4
Original line number Diff line number Diff line
@@ -719,9 +719,10 @@ static inline unsigned char curseg_alloc_type(struct f2fs_sb_info *sbi, 
	return curseg->alloc_type;

}



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

static inline bool valid_main_segno(struct f2fs_sb_info *sbi,

		unsigned int segno)

{

	f2fs_bug_on(sbi, segno > TOTAL_SEGS(sbi) - 1);

	return segno <= (MAIN_SEGS(sbi) - 1);

}



static inline void verify_fio_blkaddr(struct f2fs_io_info *fio)
@@ -776,7 +777,7 @@ static inline int check_block_count(struct f2fs_sb_info *sbi, 


	/* check segment usage, and check boundary of a given segment number */

	if (unlikely(GET_SIT_VBLOCKS(raw_sit) > usable_blks_per_seg

					|| segno > TOTAL_SEGS(sbi) - 1)) {

					|| !valid_main_segno(sbi, segno))) {

		f2fs_err(sbi, "Wrong valid blocks %d or segno %u",

			 GET_SIT_VBLOCKS(raw_sit), segno);

		set_sbi_flag(sbi, SBI_NEED_FSCK);
@@ -793,7 +794,7 @@ static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi, 
	unsigned int offset = SIT_BLOCK_OFFSET(start);

	block_t blk_addr = sit_i->sit_base_addr + offset;



	check_seg_range(sbi, start);

	f2fs_bug_on(sbi, !valid_main_segno(sbi, start));



#ifdef CONFIG_F2FS_CHECK_FS

	if (f2fs_test_bit(offset, sit_i->sit_bitmap) !=