summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/sysfile.c
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2013-02-21 16:42:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 17:22:19 -0800
commitd787ab0977c58e2c421b8d0ab49e363893ddb814 (patch)
treed55c305e7e011fcb271f8b8be4a7bc94274712a1 /fs/ocfs2/sysfile.c
parent49deb4bc227cb9db5b8ebf9434367f8bed057c7a (diff)
downloadop-kernel-dev-d787ab0977c58e2c421b8d0ab49e363893ddb814.zip
op-kernel-dev-d787ab0977c58e2c421b8d0ab49e363893ddb814.tar.gz
ocfs2: remove kfree() redundant null checks
smatch analysis indicates a number of redundant NULL checks before calling kfree(), eg: fs/ocfs2/alloc.c:6138 ocfs2_begin_truncate_log_recovery() info: redundant null check on *tl_copy calling kfree() fs/ocfs2/alloc.c:6755 ocfs2_zero_range_for_truncate() info: redundant null check on pages calling kfree() etc.... [akpm@linux-foundation.org: revert dubious change in ocfs2_begin_truncate_log_recovery()] Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Cc: Mark Fasheh <mfasheh@suse.com> Acked-by: 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/sysfile.c')
-rw-r--r--fs/ocfs2/sysfile.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/sysfile.c b/fs/ocfs2/sysfile.c
index 3d635f4..f053688 100644
--- a/fs/ocfs2/sysfile.c
+++ b/fs/ocfs2/sysfile.c
@@ -91,8 +91,7 @@ static struct inode **get_local_system_inode(struct ocfs2_super *osb,
} else
osb->local_system_inodes = local_system_inodes;
spin_unlock(&osb->osb_lock);
- if (unlikely(free))
- kfree(free);
+ kfree(free);
}
index = (slot * NUM_LOCAL_SYSTEM_INODES) +
OpenPOWER on IntegriCloud