aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2015-05-01 21:38:00 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-08 09:23:53 +0200
commit081825f589cc23d479a59e18ad093ef0b637b051 (patch)
tree5c99e76604afa24f7d215431120c42351c9f04ce
parentStaging: lustre: llite: file: remove unneeded null test before free (diff)
Staging: lustre: llite: llite_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/llite/llite_lib.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index e5bac94f690b..c6611b11779c 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -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;
}