Staging: lustre: llite: llite_lib: remove unneeded null test before free
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 1 May 2015 19:38:00 +0000 (21:38 +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/llite/llite_lib.c

index e5bac94f690b326c5d46e39199d874d7ec4a452d..c6611b11779c1e08b0c51706d88961cb89ede297 100644 (file)
@@ -574,10 +574,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                get_uuid2fsid(uuid->uuid, strlen(uuid->uuid), &sbi->ll_fsid);
        }
 
-       if (data != NULL)
-               kfree(data);
-       if (osfs != NULL)
-               kfree(osfs);
+       kfree(data);
+       kfree(osfs);
 
        return err;
 out_root:
@@ -595,10 +593,8 @@ out_md:
        obd_disconnect(sbi->ll_md_exp);
        sbi->ll_md_exp = NULL;
 out:
-       if (data != NULL)
-               kfree(data);
-       if (osfs != NULL)
-               kfree(osfs);
+       kfree(data);
+       kfree(osfs);
        lprocfs_unregister_mountpoint(sbi);
        return err;
 }