diff options
| author |   Julia Lawall <Julia.Lawall@lip6.fr> | 2015-05-01 21:38:02 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-08 09:23:52 +0200 |
| commit | 57876fd8bf6b90362ae511c4d201847a1e18bacf (patch) | |
| tree | df52fabb1f1de31f0b793ccfd3945254fc6c5e3c | |
| parent | staging: lustre: libcfs: linux: remove unneeded null test before free (diff) | |
Staging: lustre: llite: dir: 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>
This patch additionally simplifies one case where the free, and thus the
jump to the end of the function, is not needed.
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/dir.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c index f17154aaa329..4b0de8d89e5c 100644 --- a/drivers/staging/lustre/lustre/llite/dir.c +++ b/drivers/staging/lustre/lustre/llite/dir.c @@ -754,10 +754,8 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump, char *buf; param = kzalloc(MGS_PARAM_MAXLEN, GFP_NOFS); - if (!param) { - rc = -ENOMEM; - goto end; - } + if (!param) + return -ENOMEM; buf = param; /* Get fsname and assume devname to be -MDT0000. */ @@ -786,8 +784,7 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump, rc = ll_send_mgc_param(mgc->u.cli.cl_mgc_mgsexp, param); end: - if (param != NULL) - kfree(param); + kfree(param); } return rc; } |