Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nilfs2: remove redundant pointer checks in bmap lookup functions

Browse source 
nilfs_bmap_lookup and its variants are supposed to take a valid
pointer argument to return a block address, thus pointer checks in
nilfs_btree_lookup and nilfs_direct_lookup are needless.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi 2010-07-13 23:33:51 +09:00
parent 05d0e94b66
commit 364ec2d700
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/nilfs2/btree.c
View file

@ -555,17 +555,13 @@ static int nilfs_btree_lookup(const struct nilfs_bmap *btree,
__u64 key, int level, __u64 *ptrp) __u64 key, int level, __u64 *ptrp)
{ {
struct nilfs_btree_path *path; struct nilfs_btree_path *path;
__u64 ptr;
int ret; int ret;
path = nilfs_btree_alloc_path(); path = nilfs_btree_alloc_path();
if (path == NULL) if (path == NULL)
return -ENOMEM; return -ENOMEM;
ret = nilfs_btree_do_lookup(btree, path, key, &ptr, level); ret = nilfs_btree_do_lookup(btree, path, key, ptrp, level);
if (ptrp != NULL)
*ptrp = ptr;
nilfs_btree_free_path(path); nilfs_btree_free_path(path);

3
fs/nilfs2/direct.c
View file

@ -56,8 +56,7 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *direct,
if (ptr == NILFS_BMAP_INVALID_PTR) if (ptr == NILFS_BMAP_INVALID_PTR)
return -ENOENT; return -ENOENT;
if (ptrp != NULL) *ptrp = ptr;
*ptrp = ptr;
return 0; return 0;
} }