git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6...
[safe/jmp/linux-2.6]
/
fs
/
nfsd
/
nfsctl.c
diff --git
a/fs/nfsd/nfsctl.c
b/fs/nfsd/nfsctl.c
index
7e906c5
..
b764d7d
100644
(file)
--- a/
fs/nfsd/nfsctl.c
+++ b/
fs/nfsd/nfsctl.c
@@
-776,10
+776,7
@@
static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
size -= len;
mesg += len;
}
-
- mutex_unlock(&nfsd_mutex);
- return (mesg-buf);
-
+ rv = mesg - buf;
out_free:
kfree(nthreads);
mutex_unlock(&nfsd_mutex);