Commit a89bd89f authored by Markus Elfring's avatar Markus Elfring Committed by Linus Torvalds

ocfs2: delete unnecessary checks before brelse()

brelse() 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.

Link: http://lkml.kernel.org/r/55cde320-394b-f985-56ce-1a2abea782aa@web.deSigned-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77461ba1
...@@ -2508,9 +2508,7 @@ int ocfs2_inode_lock_full_nested(struct inode *inode, ...@@ -2508,9 +2508,7 @@ int ocfs2_inode_lock_full_nested(struct inode *inode,
ocfs2_inode_unlock(inode, ex); ocfs2_inode_unlock(inode, ex);
} }
if (local_bh) brelse(local_bh);
brelse(local_bh);
return status; return status;
} }
...@@ -2593,8 +2591,7 @@ int ocfs2_inode_lock_atime(struct inode *inode, ...@@ -2593,8 +2591,7 @@ int ocfs2_inode_lock_atime(struct inode *inode,
*level = 1; *level = 1;
if (ocfs2_should_update_atime(inode, vfsmnt)) if (ocfs2_should_update_atime(inode, vfsmnt))
ocfs2_update_inode_atime(inode, bh); ocfs2_update_inode_atime(inode, bh);
if (bh) brelse(bh);
brelse(bh);
} else } else
*level = 0; *level = 0;
......
...@@ -590,8 +590,7 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster, ...@@ -590,8 +590,7 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
*extent_flags = rec->e_flags; *extent_flags = rec->e_flags;
} }
out: out:
if (eb_bh) brelse(eb_bh);
brelse(eb_bh);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment