From 4825c80fc993eab4904f9b14db240b8ce70312f4 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Tue, 28 Jul 2009 11:37:25 -0400
Subject: [PATCH] --- yaml --- r: 164592 b: refs/heads/master c:
 413d63d7106b914a4a004ac08698f10c618e4616 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfsd/nfsctl.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 79f243f09546..dd85518c96ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2522a776c1b9b5c93383d07717f895cc1a56a87a
+refs/heads/master: 413d63d7106b914a4a004ac08698f10c618e4616
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 48da164bb597..b51e7ae8b570 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/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);