summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunlong Song <yunlong.song@huawei.com>2017-08-04 17:07:15 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2017-09-21 14:11:51 -0700
commitc9881425b5b16c4dd9656d6ae0b95029157ccc50 (patch)
tree6c66975131550cfdc50e525d72d89ec38cb7b4e1
parentd39f75a593462334d1baf72b67e57bd93e9a1b0d (diff)
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 <yunlong.song@huawei.com> Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/segment.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index edc7c3d254c7..20f466ace8b0 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -868,11 +868,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
}