2013-12-09 02:30:51

by Rui Xiang

Subject: [PATCH RESEND] nfsd: return err directly while allocing failing

while nthreads alloc fails, return err value directly
without kfree.

Signed-off-by: Rui Xiang <[email protected]>
---
fs/nfsd/nfsctl.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 7f55517..1fa6b00 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -491,9 +491,10 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
}

nthreads = kcalloc(npools, sizeof(int), GFP_KERNEL);
- rv = -ENOMEM;
- if (nthreads == NULL)
- goto out_free;
+ if (nthreads == NULL) {
+ mutex_unlock(&nfsd_mutex);
+ return -ENOMEM;
+ }

if (size > 0) {
for (i = 0; i < npools; i++) {
--
1.8.2.2

2014-01-06 21:31:09

by J. Bruce Fields

Subject: Re: [PATCH RESEND] nfsd: return err directly while allocing failing

On Mon, Dec 09, 2013 at 10:29:28AM +0800, Rui Xiang wrote:
> while nthreads alloc fails, return err value directly
> without kfree.

This doesn't fix any problem that I can see, since kfree(NULL) is
defined to be a no-op.

--b.

>
> Signed-off-by: Rui Xiang <[email protected]>
> ---
> fs/nfsd/nfsctl.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index 7f55517..1fa6b00 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -491,9 +491,10 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
> }
>
> nthreads = kcalloc(npools, sizeof(int), GFP_KERNEL);
> - rv = -ENOMEM;
> - if (nthreads == NULL)
> - goto out_free;
> + if (nthreads == NULL) {
> + mutex_unlock(&nfsd_mutex);
> + return -ENOMEM;
> + }
>
> if (size > 0) {
> for (i = 0; i < npools; i++) {
> --
> 1.8.2.2
>
>