From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Fri, 1 May 2015 19:38:05 +0000 (+0200)
Subject: staging: lustre: ldlm: ldlm_lock: remove unneeded null test before free
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a1ce36c0e6d8eaefef6e60baf3be9d93fafadd7e;p=openwrt%2Fstaging%2Fblogic.git

staging: lustre: ldlm: ldlm_lock: remove unneeded null test before free

Kfree can cope with a null argument, so drop null tests.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@ expression ptr; @@

- if (ptr != NULL)
  kfree(ptr);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index 2c5fe1499ce0..6a22f4183b30 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -208,8 +208,7 @@ void ldlm_lock_put(struct ldlm_lock *lock)
 			lock->l_export = NULL;
 		}
 
-		if (lock->l_lvb_data != NULL)
-			kfree(lock->l_lvb_data);
+		kfree(lock->l_lvb_data);
 
 		ldlm_interval_free(ldlm_interval_detach(lock));
 		lu_ref_fini(&lock->l_reference);