Commit a89bd89f authored Sep 23, 2019 by Markus Elfring Committed by Linus Torvalds Sep 24, 2019

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.de


Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Joseph 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 77461ba1

fs/ocfs2/dlmglue.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -2508,9 +2508,7 @@ bail:
		ocfs2_inode_unlock(inode, ex);
		}

		if (local_bh)
		brelse(local_bh);

		return status;
		}

		@@ -2593,7 +2591,6 @@ 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);
		} else
		*level = 0;

fs/ocfs2/extent_map.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -590,7 +590,6 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
		*extent_flags = rec->e_flags;
		}
		out:
		if (eb_bh)
		brelse(eb_bh);
		return ret;
		}

Admin message