Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b94929d9 authored Jan 29, 2018 by Yunlong Song Committed by Jaegeuk Kim Mar 13, 2018

f2fs: fix heap mode to reset it back



Commit 7a20b8a6 ("f2fs: allocate node
and hot data in the beginning of partition") introduces another mount
option, heap, to reset it back. But it does not do anything for heap
mode, so fix it.

Cc: stable@vger.kernel.org
Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 0964fc1a

fs/f2fs/gc.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -191,8 +191,9 @@ static void select_policy(struct f2fs_sb_info *sbi, int gc_type,
		if (gc_type != FG_GC && p->max_search > sbi->max_victim_search)
		p->max_search = sbi->max_victim_search;

		/* let's select beginning hot/small space first */
		if (type == CURSEG_HOT_DATA \|\| IS_NODESEG(type))
		/* let's select beginning hot/small space first in no_heap mode*/
		if (test_opt(sbi, NOHEAP) &&
		(type == CURSEG_HOT_DATA \|\| IS_NODESEG(type)))
		p->offset = 0;
		else
		p->offset = SIT_I(sbi)->last_victim[p->gc_mode];

fs/f2fs/segment.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2164,7 +2164,8 @@ static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)
		if (sbi->segs_per_sec != 1)
		return CURSEG_I(sbi, type)->segno;

		if (type == CURSEG_HOT_DATA \|\| IS_NODESEG(type))
		if (test_opt(sbi, NOHEAP) &&
		(type == CURSEG_HOT_DATA \|\| IS_NODESEG(type)))
		return 0;

		if (SIT_I(sbi)->last_victim[ALLOC_NEXT])