On 19/9/3 22:40, Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Tue, 3 Sep 2019 16:33:32 +0200
>
> The brelse() function tests whether its argument is NULL
> and then returns immediately.
> Thus the tests around the shown calls are not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>
Reviewed-by: Joseph Qi <[email protected]>
> ---
> fs/ocfs2/dlmglue.c | 7 ++-----
> fs/ocfs2/extent_map.c | 3 +--
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
> index ad594fef2ab0..6e774c5ea13b 100644
> --- a/fs/ocfs2/dlmglue.c
> +++ b/fs/ocfs2/dlmglue.c
> @@ -2508,9 +2508,7 @@ int ocfs2_inode_lock_full_nested(struct inode *inode,
> ocfs2_inode_unlock(inode, ex);
> }
>
> - if (local_bh)
> - brelse(local_bh);
> -
> + brelse(local_bh);
> return status;
> }
>
> @@ -2593,8 +2591,7 @@ int ocfs2_inode_lock_atime(struct inode *inode,
> *level = 1;
> if (ocfs2_should_update_atime(inode, vfsmnt))
> ocfs2_update_inode_atime(inode, bh);
> - if (bh)
> - brelse(bh);
> + brelse(bh);
> } else
> *level = 0;
>
> diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
> index e66a249fe07c..e3e2d1b2af51 100644
> --- a/fs/ocfs2/extent_map.c
> +++ b/fs/ocfs2/extent_map.c
> @@ -590,8 +590,7 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32
> v_cluster,
> *extent_flags = rec->e_flags;
> }
> out:
> - if (eb_bh)
> - brelse(eb_bh);
> + brelse(eb_bh);
> return ret;
> }
>
> --
> 2.23.0
>
