Skip to content

Commit

Permalink
f2fs: do SSR in higher priority
Browse files Browse the repository at this point in the history
Let's check SSR in prior to LFS allocation.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  • Loading branch information
Jaegeuk Kim committed Feb 24, 2017
1 parent 035e97a commit d0db770
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions fs/f2fs/segment.c
Original file line number Diff line number Diff line change
Expand Up @@ -1324,17 +1324,6 @@ static void write_current_sum_page(struct f2fs_sb_info *sbi,
f2fs_put_page(page, 1);
}

static int is_next_segment_free(struct f2fs_sb_info *sbi, int type)
{
struct curseg_info *curseg = CURSEG_I(sbi, type);
unsigned int segno = curseg->segno + 1;
struct free_segmap_info *free_i = FREE_I(sbi);

if (segno < MAIN_SEGS(sbi) && segno % sbi->segs_per_sec)
return !test_bit(segno, free_i->free_segmap);
return 0;
}

/*
* Find a new segment from the free segments bitmap to right order
* This function should be returned with success, otherwise BUG
Expand Down Expand Up @@ -1559,21 +1548,17 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type)
static void allocate_segment_by_default(struct f2fs_sb_info *sbi,
int type, bool force)
{
struct curseg_info *curseg = CURSEG_I(sbi, type);

if (force)
new_curseg(sbi, type, true);
else if (!is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_FLAG) &&
type == CURSEG_WARM_NODE)
new_curseg(sbi, type, false);
else if (curseg->alloc_type == LFS && is_next_segment_free(sbi, type))
new_curseg(sbi, type, false);
else if (need_SSR(sbi) && get_ssr_segment(sbi, type))
change_curseg(sbi, type, true);
else
new_curseg(sbi, type, false);

stat_inc_seg_type(sbi, curseg);
stat_inc_seg_type(sbi, CURSEG_I(sbi, type));
}

void allocate_new_segments(struct f2fs_sb_info *sbi)
Expand Down

0 comments on commit d0db770

Please sign in to comment.