staging: lustre: ldlm: ldlm_resource: 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);
  ptr = NULL;
- }
// </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_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index 5922069873f5f17812da557a13dfa887bcfc1074..7149edab44f493555de9050f72dac7b10410a418 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -1137,10 +1137,8 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
                        CERROR("%s: lvbo_init failed for resource %#llx:%#llx: rc = %d\n",
                               ns->ns_obd->obd_name, name->name[0],
                               name->name[1], rc);
-                       if (res->lr_lvb_data) {
-                               kfree(res->lr_lvb_data);
-                               res->lr_lvb_data = NULL;
-                       }
+                       kfree(res->lr_lvb_data);
+                       res->lr_lvb_data = NULL;
                        res->lr_lvb_len = rc;
                        mutex_unlock(&res->lr_lvb_mutex);
                        ldlm_resource_putref(res);