|
@@ -607,13 +607,18 @@ static void __next_free_blkoff(struct f2fs_sb_info *sbi,
|
|
|
struct curseg_info *seg, block_t start)
|
|
|
{
|
|
|
struct seg_entry *se = get_seg_entry(sbi, seg->segno);
|
|
|
- block_t ofs;
|
|
|
- for (ofs = start; ofs < sbi->blocks_per_seg; ofs++) {
|
|
|
- if (!f2fs_test_bit(ofs, se->ckpt_valid_map)
|
|
|
- && !f2fs_test_bit(ofs, se->cur_valid_map))
|
|
|
- break;
|
|
|
- }
|
|
|
- seg->next_blkoff = ofs;
|
|
|
+ int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long);
|
|
|
+ unsigned long target_map[entries];
|
|
|
+ unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map;
|
|
|
+ unsigned long *cur_map = (unsigned long *)se->cur_valid_map;
|
|
|
+ int i, pos;
|
|
|
+
|
|
|
+ for (i = 0; i < entries; i++)
|
|
|
+ target_map[i] = ckpt_map[i] | cur_map[i];
|
|
|
+
|
|
|
+ pos = __find_rev_next_zero_bit(target_map, sbi->blocks_per_seg, start);
|
|
|
+
|
|
|
+ seg->next_blkoff = pos;
|
|
|
}
|
|
|
|
|
|
/*
|