summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/inode.c
diff options
context:
space:
mode:
authorJan Kara2014-12-11 00:41:42 +0100
committerLinus Torvalds2014-12-11 02:41:03 +0100
commit4a635a113bfe1eaa184410d6b6065cd8eee13607 (patch)
treecacaeb92ded0b14a914c66150913302c0e712de1 /fs/ocfs2/inode.c
parentocfs2: Fix xattr check in ocfs2_get_xattr_nolock() (diff)
downloadkernel-qcow2-linux-4a635a113bfe1eaa184410d6b6065cd8eee13607.tar.gz
kernel-qcow2-linux-4a635a113bfe1eaa184410d6b6065cd8eee13607.tar.xz
kernel-qcow2-linux-4a635a113bfe1eaa184410d6b6065cd8eee13607.zip
ocfs2: remove bogus test from ocfs2_read_locked_inode()
'args' are always set for ocfs2_read_locked_inode() and brelse() checks whether bh is NULL. So the test (args && bh) is unnecessary (plus the args part is really confusing anyway). Remove it. Coverity id: 1128856. Signed-off-by: Jan Kara <jack@suse.cz> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/inode.c')
-rw-r--r--fs/ocfs2/inode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 437de7f768c6..c8b25de9efbb 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -540,8 +540,7 @@ bail:
if (status < 0)
make_bad_inode(inode);
- if (args && bh)
- brelse(bh);
+ brelse(bh);
return status;
}