lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nilfs2: Combine nilfs_btree_release_path() and nilfs_btree_free_path()

Browse Source 
nilfs_btree_release_path() and nilfs_btree_free_path() are bound into each other
tightly. Make them into one procedure to clearify the logic and avoid some
misusages.

Signed-off-by: Li Hong <lihong.hi@gmail.com>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Li Hong
2010-04-02 18:35:00 +08:00
committed by Ryusuke Konishi
parent f905440f5e
commit 73bb48869b
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fs/nilfs2/btree.c
View File

@@ -93,18 +93,14 @@ out:
return path; return path;
} }
static inline void nilfs_btree_free_path(struct nilfs_btree_path *path) static void nilfs_btree_free_path(struct nilfs_btree_path *path)
{ {
kmem_cache_free(nilfs_btree_path_cache, path); int level = NILFS_BTREE_LEVEL_DATA;
}
static void nilfs_btree_release_path(struct nilfs_btree_path *path) for (; level < NILFS_BTREE_LEVEL_MAX; level++)
{
int level;
for (level = NILFS_BTREE_LEVEL_DATA; level < NILFS_BTREE_LEVEL_MAX;
level++)
brelse(path[level].bp_bh); brelse(path[level].bp_bh);
kmem_cache_free(nilfs_btree_path_cache, path);
} }
/* /*
@@ -573,7 +569,6 @@ static int nilfs_btree_lookup(const struct nilfs_bmap *bmap,
if (ptrp != NULL) if (ptrp != NULL)
*ptrp = ptr; *ptrp = ptr;
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
@@ -655,7 +650,6 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *bmap,
*ptrp = ptr; *ptrp = ptr;
ret = cnt; ret = cnt;
out: out:
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
} }
@@ -1139,7 +1133,6 @@ static int nilfs_btree_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
nilfs_bmap_add_blocks(bmap, stats.bs_nblocks); nilfs_bmap_add_blocks(bmap, stats.bs_nblocks);
out: out:
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
} }
@@ -1472,7 +1465,6 @@ static int nilfs_btree_delete(struct nilfs_bmap *bmap, __u64 key)
nilfs_bmap_sub_blocks(bmap, stats.bs_nblocks); nilfs_bmap_sub_blocks(bmap, stats.bs_nblocks);
out: out:
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
} }
@@ -1490,7 +1482,6 @@ static int nilfs_btree_last_key(const struct nilfs_bmap *bmap, __u64 *keyp)
ret = nilfs_btree_do_lookup_last(btree, path, keyp, NULL); ret = nilfs_btree_do_lookup_last(btree, path, keyp, NULL);
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
@@ -1944,7 +1935,6 @@ static int nilfs_btree_propagate(const struct nilfs_bmap *bmap,
nilfs_btree_propagate_p(btree, path, level, bh); nilfs_btree_propagate_p(btree, path, level, bh);
out: out:
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
@@ -2126,7 +2116,6 @@ static int nilfs_btree_assign(struct nilfs_bmap *bmap,
nilfs_btree_assign_p(btree, path, level, bh, blocknr, binfo); nilfs_btree_assign_p(btree, path, level, bh, blocknr, binfo);
out: out:
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
@@ -2190,7 +2179,6 @@ static int nilfs_btree_mark(struct nilfs_bmap *bmap, __u64 key, int level)
nilfs_bmap_set_dirty(&btree->bt_bmap); nilfs_bmap_set_dirty(&btree->bt_bmap);
out: out:
nilfs_btree_release_path(path);
nilfs_btree_free_path(path); nilfs_btree_free_path(path);
return ret; return ret;
} }