]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: lustre: lmv: remove unneeded null test before free
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 1 May 2015 19:37:58 +0000 (21:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2015 07:23:53 +0000 (09:23 +0200)
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>
drivers/staging/lustre/lustre/lmv/lmv_obd.c

index 59b8fac96ed49de8b5e95e5ab6957c7e25bc12e7..8e05852ea712faa6a8af69938fc9319697d5bfb0 100644 (file)
@@ -504,8 +504,7 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
                lmv->tgts = newtgts;
                lmv->tgts_size = newsize;
                smp_rmb();
-               if (old)
-                       kfree(old);
+               kfree(old);
 
                CDEBUG(D_CONFIG, "tgts: %p size: %d\n", lmv->tgts,
                       lmv->tgts_size);
@@ -780,8 +779,7 @@ repeat_fid2path:
        goto repeat_fid2path;
 
 out_fid2path:
-       if (remote_gf != NULL)
-               kfree(remote_gf);
+       kfree(remote_gf);
        return rc;
 }