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

Commit f905440f authored by Li Hong's avatar Li Hong Committed by Ryusuke Konishi
Browse files

nilfs2: Combine nilfs_btree_alloc_path() and nilfs_btree_init_path() 



nilfs_btree_alloc_path() and nilfs_btree_init_path() are bound into each other
tightly. Make them into one procedure to clearify the logic and avoid some
misusages.

Signed-off-by: default avatarLi Hong <lihong.hi@gmail.com>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 0d9cc233

fs/nilfs2/btree.c

+17 −22
Original line number Diff line number Diff line
@@ -71,23 +71,16 @@ void nilfs_btree_path_cache_destroy(void) 
	kmem_cache_destroy(nilfs_btree_path_cache);

}



static inline struct nilfs_btree_path *nilfs_btree_alloc_path(void)

static struct nilfs_btree_path *nilfs_btree_alloc_path(void)

{

	return kmem_cache_alloc(nilfs_btree_path_cache, GFP_NOFS);

}



static inline void nilfs_btree_free_path(struct nilfs_btree_path *path)

{

	kmem_cache_free(nilfs_btree_path_cache, path);

}

	struct nilfs_btree_path *path;

	int level = NILFS_BTREE_LEVEL_DATA;



static void nilfs_btree_init_path(struct nilfs_btree_path *path)

{

	int level;

	path = kmem_cache_alloc(nilfs_btree_path_cache, GFP_NOFS);

	if (path == NULL)

		goto out;



	for (level = NILFS_BTREE_LEVEL_DATA;

	     level < NILFS_BTREE_LEVEL_MAX;

	     level++) {

	for (; level < NILFS_BTREE_LEVEL_MAX; level++) {

		path[level].bp_bh = NULL;

		path[level].bp_sib_bh = NULL;

		path[level].bp_index = 0;
@@ -95,6 +88,14 @@ static void nilfs_btree_init_path(struct nilfs_btree_path *path) 
		path[level].bp_newreq.bpr_ptr = NILFS_BMAP_INVALID_PTR;

		path[level].bp_op = NULL;

	}



out:

	return path;

}



static inline void nilfs_btree_free_path(struct nilfs_btree_path *path)

{

	kmem_cache_free(nilfs_btree_path_cache, path);

}



static void nilfs_btree_release_path(struct nilfs_btree_path *path)
@@ -566,7 +567,6 @@ static int nilfs_btree_lookup(const struct nilfs_bmap *bmap, 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	ret = nilfs_btree_do_lookup(btree, path, key, &ptr, level);
@@ -594,7 +594,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *bmap, 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	ret = nilfs_btree_do_lookup(btree, path, key, &ptr, level);

	if (ret < 0)

		goto out;
@@ -1123,7 +1123,6 @@ static int nilfs_btree_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr) 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	ret = nilfs_btree_do_lookup(btree, path, key, NULL,

				    NILFS_BTREE_LEVEL_NODE_MIN);
@@ -1456,7 +1455,7 @@ static int nilfs_btree_delete(struct nilfs_bmap *bmap, __u64 key) 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	ret = nilfs_btree_do_lookup(btree, path, key, NULL,

				    NILFS_BTREE_LEVEL_NODE_MIN);

	if (ret < 0)
@@ -1488,7 +1487,6 @@ static int nilfs_btree_last_key(const struct nilfs_bmap *bmap, __u64 *keyp) 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	ret = nilfs_btree_do_lookup_last(btree, path, keyp, NULL);
@@ -1923,7 +1921,6 @@ static int nilfs_btree_propagate(const struct nilfs_bmap *bmap, 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	if (buffer_nilfs_node(bh)) {

		node = (struct nilfs_btree_node *)bh->b_data;
@@ -2108,7 +2105,6 @@ static int nilfs_btree_assign(struct nilfs_bmap *bmap, 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	if (buffer_nilfs_node(*bh)) {

		node = (struct nilfs_btree_node *)(*bh)->b_data;
@@ -2175,7 +2171,6 @@ static int nilfs_btree_mark(struct nilfs_bmap *bmap, __u64 key, int level) 
	path = nilfs_btree_alloc_path();

	if (path == NULL)

		return -ENOMEM;

	nilfs_btree_init_path(path);



	ret = nilfs_btree_do_lookup(btree, path, key, &ptr, level + 1);

	if (ret < 0) {