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

Commit 3352322e authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: don't track newly allocated nat entry in list 



commit febeca6d375531f2d3244b47bf0eb396180689e0 upstream.

We will never persist newly allocated nat entries during checkpoint(), so
we don't need to track such nat entries in nat dirty list in order to
avoid:
- more latency during traversing dirty list;
- sorting nat sets incorrectly due to recording wrong entry_cnt in nat
entry set.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 64c9c3b6

fs/f2fs/node.c

+10 −6
Original line number Diff line number Diff line
@@ -158,9 +158,6 @@ static void __set_nat_cache_dirty(struct f2fs_nm_info *nm_i, 
	nid_t set = NAT_BLOCK_OFFSET(ne->ni.nid);

	struct nat_entry_set *head;



	if (get_nat_flag(ne, IS_DIRTY))

		return;



	head = radix_tree_lookup(&nm_i->nat_set_root, set);

	if (!head) {

		head = f2fs_kmem_cache_alloc(nat_entry_set_slab, GFP_NOFS);
@@ -171,10 +168,18 @@ static void __set_nat_cache_dirty(struct f2fs_nm_info *nm_i, 
		head->entry_cnt = 0;

		f2fs_radix_tree_insert(&nm_i->nat_set_root, set, head);

	}

	list_move_tail(&ne->list, &head->entry_list);



	if (get_nat_flag(ne, IS_DIRTY))

		goto refresh_list;



	nm_i->dirty_nat_cnt++;

	head->entry_cnt++;

	set_nat_flag(ne, IS_DIRTY, true);

refresh_list:

	if (nat_get_blkaddr(ne) == NEW_ADDR)

		list_del_init(&ne->list);

	else

		list_move_tail(&ne->list, &head->entry_list);

}



static void __clear_nat_cache_dirty(struct f2fs_nm_info *nm_i,
@@ -2432,8 +2437,7 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi, 
		nid_t nid = nat_get_nid(ne);

		int offset;



		if (nat_get_blkaddr(ne) == NEW_ADDR)

			continue;

		f2fs_bug_on(sbi, nat_get_blkaddr(ne) == NEW_ADDR);



		if (to_journal) {

			offset = lookup_journal_in_cursum(journal,