| From: Minghao Chi <chi.minghao@zte.com.cn> |
| Subject: nilfs2: delete unnecessary checks before brelse() |
| Date: Wed, 21 Sep 2022 12:48:02 +0900 |
| |
| 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 | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/fs/nilfs2/btree.c~nilfs2-delete-unnecessary-checks-before-brelse |
| +++ a/fs/nilfs2/btree.c |
| @@ -1668,8 +1668,7 @@ static int nilfs_btree_check_delete(stru |
| 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(struc |
| ptrs[i] = le64_to_cpu(dptrs[i]); |
| } |
| |
| - if (bh != NULL) |
| - brelse(bh); |
| + brelse(bh); |
| |
| return nitems; |
| } |
| _ |
