From 44ecaf90f3f7183d1a187d213b50ee832e32303c Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Tue, 13 Jul 2010 23:33:51 +0900 Subject: [PATCH] --- yaml --- r: 206357 b: refs/heads/master c: 364ec2d700223b965620ff4d5031a3665d195873 h: refs/heads/master i: 206355: b9c2e408ec016542d89160585fc2be2396aa8a4e v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/btree.c | 6 +----- trunk/fs/nilfs2/direct.c | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index afa14cc63134..a043916c8a70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05d0e94b66dbdf9d90371b39dc7a6b390ba74d41 +refs/heads/master: 364ec2d700223b965620ff4d5031a3665d195873 diff --git a/trunk/fs/nilfs2/btree.c b/trunk/fs/nilfs2/btree.c index 0543bf9f80ba..18bb965c66b5 100644 --- a/trunk/fs/nilfs2/btree.c +++ b/trunk/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/trunk/fs/nilfs2/direct.c b/trunk/fs/nilfs2/direct.c index 318613010106..324d80c57518 100644 --- a/trunk/fs/nilfs2/direct.c +++ b/trunk/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; }