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

Commit d7bc2484 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: fix small discards not to issue redundantly 



The ckpt_valid_map and cur_valid_map are synced by seg_info_to_raw_sit.

In the case of small discards, the candidates are selected before sync,
while fitrim selects candidates after sync.

So, for small discards, we need to add candidates only just being obsoleted.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 1e84371f

fs/f2fs/segment.c

+5 −3
Original line number Diff line number Diff line
@@ -525,7 +525,8 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	bool force = (cpc->reason == CP_DISCARD);

	int i;



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

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

			SM_I(sbi)->nr_discards >= SM_I(sbi)->max_discards))

		return;



	if (force && !se->valid_blocks) {
@@ -553,7 +554,8 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc) 


	/* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */

	for (i = 0; i < entries; i++)

		dmap[i] = ~(cur_map[i] | ckpt_map[i]);

		dmap[i] = force ? ~ckpt_map[i] :

				(cur_map[i] ^ ckpt_map[i]) & ckpt_map[i];



	while (force || SM_I(sbi)->nr_discards <= SM_I(sbi)->max_discards) {

		start = __find_rev_next_bit(dmap, max_blocks, end + 1);
@@ -1759,7 +1761,7 @@ void flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
			se = get_seg_entry(sbi, segno);



			/* add discard candidates */

			if (SM_I(sbi)->nr_discards < SM_I(sbi)->max_discards) {

			if (cpc->reason != CP_DISCARD) {

				cpc->trim_start = segno;

				add_discard_addrs(sbi, cpc);

			}