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

Commit 650d3c4e authored by Yunlei He's avatar Yunlei He Committed by Jaegeuk Kim
Browse files

f2fs: fix a missing discard prefree segments 



If userspace issue a fstrim with a range not involve prefree segments,
it will reuse these segments without discard. This patch fix it.

Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent ed0b5620

fs/f2fs/segment.c

+9 −1
Original line number Diff line number Diff line
@@ -916,7 +916,11 @@ void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc) 


		dirty_i->nr_dirty[PRE] -= end - start;



		if (force || !test_opt(sbi, DISCARD))

		if (!test_opt(sbi, DISCARD))

			continue;



		if (force && start >= cpc->trim_start &&

					(end - 1) <= cpc->trim_end)

				continue;



		if (!test_opt(sbi, LFS) || sbi->segs_per_sec == 1) {
@@ -2263,8 +2267,12 @@ void flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	f2fs_bug_on(sbi, sit_i->dirty_sentries);

out:

	if (cpc->reason == CP_DISCARD) {

		__u64 trim_start = cpc->trim_start;



		for (; cpc->trim_start <= cpc->trim_end; cpc->trim_start++)

			add_discard_addrs(sbi, cpc);



		cpc->trim_start = trim_start;

	}

	mutex_unlock(&sit_i->sentry_lock);