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: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 0543bf9f80baae1296c201403957da86e8d1d490..18bb965c66b578e99703df14f239f23cb2ba76d5 100644 (file)
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -555,17 +555,13 @@ static int nilfs_btree_lookup(const struct nilfs_bmap *btree,
                              __u64 key, int level, __u64 *ptrp)
 {
        struct nilfs_btree_path *path;
-       __u64 ptr;
        int ret;
 
        path = nilfs_btree_alloc_path();
        if (path == NULL)
                return -ENOMEM;
 
-       ret = nilfs_btree_do_lookup(btree, path, key, &ptr, level);
-
-       if (ptrp != NULL)
-               *ptrp = ptr;
+       ret = nilfs_btree_do_lookup(btree, path, key, ptrp, level);
 
        nilfs_btree_free_path(path);
 

diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c
index 318613010106bd554ebfbfb2d9f9f5bfc8803f7a..324d80c57518ad09a83cab70ee1ca6abfae4d644 100644 (file)
--- a/fs/nilfs2/direct.c
+++ b/fs/nilfs2/direct.c
@@ -56,8 +56,7 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *direct,
        if (ptr == NILFS_BMAP_INVALID_PTR)
                return -ENOENT;
 
-       if (ptrp != NULL)
-               *ptrp = ptr;
+       *ptrp = ptr;
        return 0;
 }