|
@@ -388,11 +388,8 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
- if (!need)
|
|
|
- return;
|
|
|
-
|
|
|
/* balance_fs_bg is able to be pending */
|
|
|
- if (excess_cached_nats(sbi))
|
|
|
+ if (need && excess_cached_nats(sbi))
|
|
|
f2fs_balance_fs_bg(sbi);
|
|
|
|
|
|
/*
|
|
@@ -1639,6 +1636,17 @@ 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
|
|
@@ -1752,6 +1760,10 @@ static void reset_curseg(struct f2fs_sb_info *sbi, int type, int modified)
|
|
|
|
|
|
static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)
|
|
|
{
|
|
|
+ /* if segs_per_sec is large than 1, we need to keep original policy. */
|
|
|
+ if (sbi->segs_per_sec != 1)
|
|
|
+ return CURSEG_I(sbi, type)->segno;
|
|
|
+
|
|
|
if (type == CURSEG_HOT_DATA || IS_NODESEG(type))
|
|
|
return 0;
|
|
|
|
|
@@ -1901,17 +1913,21 @@ 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_I(sbi, type));
|
|
|
+ stat_inc_seg_type(sbi, curseg);
|
|
|
}
|
|
|
|
|
|
void allocate_new_segments(struct f2fs_sb_info *sbi)
|