summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/slot_map.c
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-04-14 15:42:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-14 16:48:56 -0700
commitfd90d4dfb94a8c0d626c0c85ca7dcfb905f81a65 (patch)
tree3cf9ba6eb7ae680a20085eae33c2609a6bf5852b /fs/ocfs2/slot_map.c
parent1cf370c61179e01313457363b21f0859be0d8cb7 (diff)
downloadlinux-fd90d4dfb94a8c0d626c0c85ca7dcfb905f81a65.tar.gz
linux-fd90d4dfb94a8c0d626c0c85ca7dcfb905f81a65.tar.bz2
linux-fd90d4dfb94a8c0d626c0c85ca7dcfb905f81a65.zip
ocfs2: delete unnecessary checks before three function calls
kfree(), ocfs2_free_path() and __ocfs2_free_slot_info() test whether their argument is NULL and then return immediately. Thus the test around their calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> 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/slot_map.c')
-rw-r--r--fs/ocfs2/slot_map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index d5493e361a38..c5e530a9d1b1 100644
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -452,7 +452,7 @@ int ocfs2_init_slot_info(struct ocfs2_super *osb)
osb->slot_info = (struct ocfs2_slot_info *)si;
bail:
- if (status < 0 && si)
+ if (status < 0)
__ocfs2_free_slot_info(si);
return status;