From: Yunlong Song Date: Fri, 4 Aug 2017 09:07:15 +0000 (+0800) Subject: f2fs: fix the size value in __check_sit_bitmap X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=008396e1b026b3873091b555b808155da7d9d18f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git f2fs: fix the size value in __check_sit_bitmap The current size value is not correct and will miss bitmap check. Signed-off-by: Yunlong Song Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index c6e4a1174f8a..95267630c8c4 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -787,11 +787,14 @@ void __check_sit_bitmap(struct f2fs_sb_info *sbi, sentry = get_seg_entry(sbi, segno); offset = GET_BLKOFF_FROM_SEG0(sbi, blk); - size = min((unsigned long)(end - blk), max_blocks); + if (end < START_BLOCK(sbi, segno + 1)) + size = GET_BLKOFF_FROM_SEG0(sbi, end); + else + size = max_blocks; map = (unsigned long *)(sentry->cur_valid_map); offset = __find_rev_next_bit(map, size, offset); f2fs_bug_on(sbi, offset != size); - blk += size; + blk = START_BLOCK(sbi, segno + 1); } #endif }