projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd17e03
)
nilfs2: delete unnecessary checks before brelse()
author
Minghao Chi
<chi.minghao@zte.com.cn>
Wed, 21 Sep 2022 03:48:02 +0000
(12:48 +0900)
committer
Andrew Morton
<akpm@linux-foundation.org>
Mon, 3 Oct 2022 21:21:44 +0000
(14:21 -0700)
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>
fs/nilfs2/btree.c
patch
|
blob
|
history
diff --git
a/fs/nilfs2/btree.c
b/fs/nilfs2/btree.c
index 9f4d9432d38a196ef4db01996055ee65b1ff3e0f..b9d15c3df3cc193ba10cf88761d45027ee6de346 100644
(file)
--- 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;
}