Commit 91f4382b authored Sep 23, 2017 by Yunlong Song Committed by Jaegeuk Kim Oct 10, 2017

Revert "f2fs: node segment is prior to data segment selected victim"



This reverts commit b9cd2061.

That patch causes much fewer node segments (which can be used for SSR)
than before, and in the corner case (e.g. create and delete *.txt files in
one same directory, there will be very few node segments but many data
segments), if the reserved free segments are all used up during gc, then
the write_checkpoint can still flush dentry pages to data ssr segments,
but will probably fail to flush node pages to node ssr segments, since
there are not enough node ssr segments left (the left ones are all
full).

So revert this patch to give a fair chance to let node segments remain
for SSR, which provides more robustness for corner cases.

Conflicts:
	fs/f2fs/gc.c

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 7056964a

fs/f2fs/gc.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -267,16 +267,6 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
		return UINT_MAX - ((100 * (100 - u) * age) / (100 + u));
		}

		static unsigned int get_greedy_cost(struct f2fs_sb_info *sbi,
		unsigned int segno)
		{
		unsigned int valid_blocks =
		get_valid_blocks(sbi, segno, true);

		return IS_DATASEG(get_seg_entry(sbi, segno)->type) ?
		valid_blocks * 2 : valid_blocks;
		}

		static inline unsigned int get_gc_cost(struct f2fs_sb_info *sbi,
		unsigned int segno, struct victim_sel_policy *p)
		{
		@@ -285,7 +275,7 @@ static inline unsigned int get_gc_cost(struct f2fs_sb_info *sbi,

		/* alloc_mode == LFS */
		if (p->gc_mode == GC_GREEDY)
		return get_greedy_cost(sbi, segno);
		return get_valid_blocks(sbi, segno, true);
		else
		return get_cb_cost(sbi, segno);
		}

Admin message