diff options
| author |   Minghao Chi <chi.minghao@zte.com.cn> | 2022-09-21 12:48:02 +0900 |
|---|---|---|
| committer |   Andrew Morton <akpm@linux-foundation.org> | 2022-10-03 14:21:44 -0700 |
| commit | 0badb2e46a7699d09ef09a2c7f8f4fe66c15e606 (patch) | |
| tree | 66489a81dca2be5c5828d8ccb032b5d2005cd5d5 | |
| parent | checkpatch: warn for non-standard fixes tag style (diff) | |
| download | linux-dev-0badb2e46a7699d09ef09a2c7f8f4fe66c15e606.tar.xz linux-dev-0badb2e46a7699d09ef09a2c7f8f4fe66c15e606.zip | |
nilfs2: delete unnecessary checks before brelse()
Patch series "nilfs2 minor amendments".
This patch (of 2):
The brelse() inline function tests whether its argument is NULL and then
returns immediately. Thus remove the tests which are not needed around
the shown calls.
Link: https://lkml.kernel.org/r/20220921034803.2476-1-konishi.ryusuke@gmail.com
Link: https://lkml.kernel.org/r/20220819081700.96279-1-chi.minghao@zte.com.cn
Link: https://lkml.kernel.org/r/20220921034803.2476-2-konishi.ryusuke@gmail.com
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Cc: ye xingchen <ye.xingchen@zte.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | fs/nilfs2/btree.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c index 9f4d9432d38a..b9d15c3df3cc 100644 --- a/fs/nilfs2/btree.c +++ b/fs/nilfs2/btree.c @@ -1668,8 +1668,7 @@ static int nilfs_btree_check_delete(struct nilfs_bmap *btree, __u64 key) maxkey = nilfs_btree_node_get_key(node, nchildren - 1); nextmaxkey = (nchildren > 1) ? nilfs_btree_node_get_key(node, nchildren - 2) : 0; - if (bh != NULL) - brelse(bh); + brelse(bh); return (maxkey == key) && (nextmaxkey < NILFS_BMAP_LARGE_LOW); } @@ -1717,8 +1716,7 @@ static int nilfs_btree_gather_data(struct nilfs_bmap *btree, ptrs[i] = le64_to_cpu(dptrs[i]); } - if (bh != NULL) - brelse(bh); + brelse(bh); return nitems; } |