diff mbox

ocfs2: clean up redundant NULL checks before kfree

Message ID 55E54B90.40601@huawei.com (mailing list archive)
State New, archived
Headers show

Commit Message

Joseph Qi Sept. 1, 2015, 6:54 a.m. UTC 
NULL check before kfree is redundant and so clean them up.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
---
 fs/ocfs2/alloc.c    | 2 +-
 fs/ocfs2/suballoc.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

Comments

Mark Fasheh Sept. 1, 2015, 10:41 p.m. UTC | #1 
On Tue, Sep 01, 2015 at 02:54:08PM +0800, Joseph Qi wrote:
> NULL check before kfree is redundant and so clean them up.
> 
> Signed-off-by: Joseph Qi <joseph.qi@huawei.com>

Thanks,

Reviewed-by: Mark Fasheh <mfasheh@suse.de>
	--Mark

--
Mark Fasheh
diff mbox

Patch

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 5997c00..73f6684 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -6175,7 +6175,7 @@  bail:
 		iput(tl_inode);
 	brelse(tl_bh);

-	if (status < 0 && (*tl_copy)) {
+	if (status < 0) {
 		kfree(*tl_copy);
 		*tl_copy = NULL;
 		mlog_errno(status);
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 4479029..68a6a80 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -149,10 +149,8 @@  void ocfs2_free_ac_resource(struct ocfs2_alloc_context *ac)
 	brelse(ac->ac_bh);
 	ac->ac_bh = NULL;
 	ac->ac_resv = NULL;
-	if (ac->ac_find_loc_priv) {
-		kfree(ac->ac_find_loc_priv);
-		ac->ac_find_loc_priv = NULL;
-	}
+	kfree(ac->ac_find_loc_priv);
+	ac->ac_find_loc_priv = NULL;
 }

 void ocfs2_free_alloc_context(struct ocfs2_alloc_context *ac)