summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-07-28 17:37:25 +0200
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-07-28 20:29:41 +0200
commit413d63d7106b914a4a004ac08698f10c618e4616 (patch)
treee481bf2f0da4388707bebfd1d3a2e69ee44614f8
parentFix memory leak in write_pool_threads (diff)
downloadlinux-413d63d7106b914a4a004ac08698f10c618e4616.tar.xz
linux-413d63d7106b914a4a004ac08698f10c618e4616.zip
nfsd: minor write_pool_threads exit cleanup
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/nfsd/nfsctl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 48da164bb597..b51e7ae8b570 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -784,11 +784,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
size -= len;
mesg += len;
}
-
- kfree(nthreads);
- mutex_unlock(&nfsd_mutex);
- return (mesg-buf);
-
+ rv = mesg - buf;
out_free:
kfree(nthreads);
mutex_unlock(&nfsd_mutex);