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

Commit 71b40527 authored by Fan Li's avatar Fan Li Committed by Jaegeuk Kim
Browse files

f2fs: add a function to move nid 



This patch add a new function to move nid from one state to another.
Move operation is heavily used, by adding a new function for it
we can cut down some branches from several flow.

Signed-off-by: default avatarFan li <fanofcode.li@samsung.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 8f5dcea4

fs/f2fs/node.c

+36 −21
Original line number Original line Diff line number Diff line
@@ -1766,15 +1766,13 @@ static struct free_nid *__lookup_free_nid_list(struct f2fs_nm_info *nm_i, 
}

}





static int __insert_free_nid(struct f2fs_sb_info *sbi,

static int __insert_free_nid(struct f2fs_sb_info *sbi,

			struct free_nid *i, enum nid_state state, bool new)

			struct free_nid *i, enum nid_state state)

{

{

	struct f2fs_nm_info *nm_i = NM_I(sbi);

	struct f2fs_nm_info *nm_i = NM_I(sbi);





	if (new) {

	int err = radix_tree_insert(&nm_i->free_nid_root, i->nid, i);

	int err = radix_tree_insert(&nm_i->free_nid_root, i->nid, i);

	if (err)

	if (err)

		return err;

		return err;

	}





	f2fs_bug_on(sbi, state != i->state);

	f2fs_bug_on(sbi, state != i->state);

	nm_i->nid_cnt[state]++;

	nm_i->nid_cnt[state]++;
@@ -1784,7 +1782,7 @@ static int __insert_free_nid(struct f2fs_sb_info *sbi, 
}

}





static void __remove_free_nid(struct f2fs_sb_info *sbi,

static void __remove_free_nid(struct f2fs_sb_info *sbi,

			struct free_nid *i, enum nid_state state, bool reuse)

			struct free_nid *i, enum nid_state state)

{

{

	struct f2fs_nm_info *nm_i = NM_I(sbi);

	struct f2fs_nm_info *nm_i = NM_I(sbi);
@@ -1792,10 +1790,31 @@ static void __remove_free_nid(struct f2fs_sb_info *sbi, 
	nm_i->nid_cnt[state]--;

	nm_i->nid_cnt[state]--;

	if (state == FREE_NID)

	if (state == FREE_NID)

		list_del(&i->list);

		list_del(&i->list);

	if (!reuse)

	radix_tree_delete(&nm_i->free_nid_root, i->nid);

	radix_tree_delete(&nm_i->free_nid_root, i->nid);

}

}





static void __move_free_nid(struct f2fs_sb_info *sbi, struct free_nid *i,

			enum nid_state org_state, enum nid_state dst_state)

{

	struct f2fs_nm_info *nm_i = NM_I(sbi);



	f2fs_bug_on(sbi, org_state != i->state);

	i->state = dst_state;

	nm_i->nid_cnt[org_state]--;

	nm_i->nid_cnt[dst_state]++;



	switch (dst_state) {

	case PREALLOC_NID:

		list_del(&i->list);

		break;

	case FREE_NID:

		list_add_tail(&i->list, &nm_i->free_nid_list);

		break;

	default:

		BUG_ON(1);

	}

}



/* return if the nid is recognized as free */

/* return if the nid is recognized as free */

static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)

static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)

{

{
@@ -1853,7 +1872,7 @@ static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build) 
		}

		}

	}

	}

	ret = true;

	ret = true;

	err = __insert_free_nid(sbi, i, FREE_NID, true);

	err = __insert_free_nid(sbi, i, FREE_NID);

err_out:

err_out:

	spin_unlock(&nm_i->nid_list_lock);

	spin_unlock(&nm_i->nid_list_lock);

	radix_tree_preload_end();

	radix_tree_preload_end();
@@ -1872,7 +1891,7 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid) 
	spin_lock(&nm_i->nid_list_lock);

	spin_lock(&nm_i->nid_list_lock);

	i = __lookup_free_nid_list(nm_i, nid);

	i = __lookup_free_nid_list(nm_i, nid);

	if (i && i->state == FREE_NID) {

	if (i && i->state == FREE_NID) {

		__remove_free_nid(sbi, i, FREE_NID, false);

		__remove_free_nid(sbi, i, FREE_NID);

		need_free = true;

		need_free = true;

	}

	}

	spin_unlock(&nm_i->nid_list_lock);

	spin_unlock(&nm_i->nid_list_lock);
@@ -2083,9 +2102,7 @@ retry: 
					struct free_nid, list);

					struct free_nid, list);

		*nid = i->nid;

		*nid = i->nid;





		__remove_free_nid(sbi, i, FREE_NID, true);

		__move_free_nid(sbi, i, FREE_NID, PREALLOC_NID);

		i->state = PREALLOC_NID;

		__insert_free_nid(sbi, i, PREALLOC_NID, false);

		nm_i->available_nids--;

		nm_i->available_nids--;





		update_free_nid_bitmap(sbi, *nid, false, false);

		update_free_nid_bitmap(sbi, *nid, false, false);
@@ -2111,7 +2128,7 @@ void alloc_nid_done(struct f2fs_sb_info *sbi, nid_t nid) 
	spin_lock(&nm_i->nid_list_lock);

	spin_lock(&nm_i->nid_list_lock);

	i = __lookup_free_nid_list(nm_i, nid);

	i = __lookup_free_nid_list(nm_i, nid);

	f2fs_bug_on(sbi, !i);

	f2fs_bug_on(sbi, !i);

	__remove_free_nid(sbi, i, PREALLOC_NID, false);

	__remove_free_nid(sbi, i, PREALLOC_NID);

	spin_unlock(&nm_i->nid_list_lock);

	spin_unlock(&nm_i->nid_list_lock);





	kmem_cache_free(free_nid_slab, i);

	kmem_cache_free(free_nid_slab, i);
@@ -2134,12 +2151,10 @@ void alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid) 
	f2fs_bug_on(sbi, !i);

	f2fs_bug_on(sbi, !i);





	if (!available_free_memory(sbi, FREE_NIDS)) {

	if (!available_free_memory(sbi, FREE_NIDS)) {

		__remove_free_nid(sbi, i, PREALLOC_NID, false);

		__remove_free_nid(sbi, i, PREALLOC_NID);

		need_free = true;

		need_free = true;

	} else {

	} else {

		__remove_free_nid(sbi, i, PREALLOC_NID, true);

		__move_free_nid(sbi, i, PREALLOC_NID, FREE_NID);

		i->state = FREE_NID;

		__insert_free_nid(sbi, i, FREE_NID, false);

	}

	}





	nm_i->available_nids++;

	nm_i->available_nids++;
@@ -2170,7 +2185,7 @@ int try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink) 
				nm_i->nid_cnt[FREE_NID] <= MAX_FREE_NIDS)

				nm_i->nid_cnt[FREE_NID] <= MAX_FREE_NIDS)

			break;

			break;





		__remove_free_nid(sbi, i, FREE_NID, false);

		__remove_free_nid(sbi, i, FREE_NID);

		kmem_cache_free(free_nid_slab, i);

		kmem_cache_free(free_nid_slab, i);

		nr_shrink--;

		nr_shrink--;

	}

	}
@@ -2749,7 +2764,7 @@ void destroy_node_manager(struct f2fs_sb_info *sbi) 
	/* destroy free nid list */

	/* destroy free nid list */

	spin_lock(&nm_i->nid_list_lock);

	spin_lock(&nm_i->nid_list_lock);

	list_for_each_entry_safe(i, next_i, &nm_i->free_nid_list, list) {

	list_for_each_entry_safe(i, next_i, &nm_i->free_nid_list, list) {

		__remove_free_nid(sbi, i, FREE_NID, false);

		__remove_free_nid(sbi, i, FREE_NID);

		spin_unlock(&nm_i->nid_list_lock);

		spin_unlock(&nm_i->nid_list_lock);

		kmem_cache_free(free_nid_slab, i);

		kmem_cache_free(free_nid_slab, i);

		spin_lock(&nm_i->nid_list_lock);

		spin_lock(&nm_i->nid_list_lock);