Commit 364ec2d7 authored by Ryusuke Konishi's avatar Ryusuke Konishi

nilfs2: remove redundant pointer checks in bmap lookup functions

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: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 05d0e94b
...@@ -555,17 +555,13 @@ static int nilfs_btree_lookup(const struct nilfs_bmap *btree, ...@@ -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);
......
...@@ -56,7 +56,6 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *direct, ...@@ -56,7 +56,6 @@ 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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment