redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Staging: lustre: ptlrpc: lproc_ptlrpc: 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>

In the first case, the only cleanup needed is the unlock, so jump to that
directly.

Likewise, in the first two failure cases of ptlrpc_lprocfs_nrs_seq_write,
no cleanup is needed, so just drop the goto and return directly.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Julia Lawall 2015-05-01 21:37:49 +02:00 committed by Greg Kroah-Hartman
parent 59e267c07b
commit 848e90c332
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
View File

@ -510,7 +510,7 @@ static int ptlrpc_lprocfs_nrs_seq_show(struct seq_file *m, void *n)
infos = kcalloc(num_pols, sizeof(*infos), GFP_NOFS);
if (infos == NULL) {
rc = -ENOMEM;
goto out;
goto unlock;
}
again:
@ -617,10 +617,8 @@ again:
goto again;
}
out:
if (infos)
kfree(infos);
kfree(infos);
unlock:
mutex_unlock(&nrs_core.nrs_mutex);
return rc;
@ -650,16 +648,12 @@ static ssize_t ptlrpc_lprocfs_nrs_seq_write(struct file *file,
char *token;
int rc = 0;
if (count >= LPROCFS_NRS_WR_MAX_CMD) {
rc = -EINVAL;
goto out;
}
if (count >= LPROCFS_NRS_WR_MAX_CMD)
return -EINVAL;
cmd = kzalloc(LPROCFS_NRS_WR_MAX_CMD, GFP_NOFS);
if (cmd == NULL) {
rc = -ENOMEM;
goto out;
}
if (cmd == NULL)
return -ENOMEM;
/**
* strsep() modifies its argument, so keep a copy
*/
@ -716,8 +710,7 @@ default_queue:
mutex_unlock(&nrs_core.nrs_mutex);
out:
if (cmd_copy)
kfree(cmd_copy);
kfree(cmd_copy);
return rc < 0 ? rc : count;
}
@ -860,8 +853,7 @@ ptlrpc_lprocfs_svc_req_history_stop(struct seq_file *s, void *iter)
{
struct ptlrpc_srh_iterator *srhi = iter;
if (srhi != NULL)
kfree(srhi);
kfree(srhi);
}
static void *