staging: lustre: libcfs: linux: remove unneeded null test before free
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 1 May 2015 19:38:03 +0000 (21:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2015 07:23:52 +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);
  ptr = NULL;
- }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c

index c8e293002e070b16977f270997a9029232e49b57..483cbc82e53889bcdde48e6b9740c56012276bdc 100644 (file)
@@ -102,11 +102,10 @@ void cfs_tracefile_fini_arch(void)
        int    j;
 
        for (i = 0; i < num_possible_cpus(); i++)
-               for (j = 0; j < 3; j++)
-                       if (cfs_trace_console_buffers[i][j] != NULL) {
-                               kfree(cfs_trace_console_buffers[i][j]);
-                               cfs_trace_console_buffers[i][j] = NULL;
-                       }
+               for (j = 0; j < 3; j++) {
+                       kfree(cfs_trace_console_buffers[i][j]);
+                       cfs_trace_console_buffers[i][j] = NULL;
+               }
 
        for (i = 0; cfs_trace_data[i] != NULL; i++) {
                kfree(cfs_trace_data[i]);