summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2015-05-01 21:38:06 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-08 09:23:51 +0200
commit1134507ca420fadd465ebdbc4f6c5d5798d6ab87 (patch)
tree4d30b8d52651c4d935538e17c93c84e1989abff8
parent9ae10597280cede9b2462b96cec7398cbbf1459f (diff)
downloadlinux-1134507ca420fadd465ebdbc4f6c5d5798d6ab87.tar.bz2
staging: lustre: ldlm: ldlm_lib: 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>
-rw-r--r--drivers/staging/lustre/lustre/ldlm/ldlm_lib.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index d0667715ebf7..0a0b435f11fc 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -119,8 +119,7 @@ static int import_set_conn(struct obd_import *imp, struct obd_uuid *uuid,
spin_unlock(&imp->imp_lock);
return 0;
out_free:
- if (imp_conn)
- kfree(imp_conn);
+ kfree(imp_conn);
out_put:
ptlrpc_connection_put(ptlrpc_conn);
return rc;