summaryrefslogtreecommitdiff
path: root/fs/nfsd/nfssvc.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-01-30 16:21:11 -0500
committerJ. Bruce Fields <bfields@redhat.com>2012-02-03 15:33:17 -0500
commit508f92275624fc755104b17945bdc822936f1918 (patch)
tree9a89a7bcd7773a5d3f0652cdc78bd91ddd2193aa /fs/nfsd/nfssvc.c
parent87b0fc7deb5feccf93b022f6a976e8441152dbb2 (diff)
downloadlinux-next-508f92275624fc755104b17945bdc822936f1918.tar.gz
nfsd: fix default iosize calculation on 32bit
The rpc buffers will be allocated out of low memory, so we should really only be taking that into account. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfssvc.c')
-rw-r--r--fs/nfsd/nfssvc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index e9eb408ae2a8..aacf1f4b9fb5 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -314,7 +314,7 @@ static int nfsd_get_default_max_blksize(void)
unsigned long ret;
si_meminfo(&i);
- target = i.totalram << PAGE_SHIFT;
+ target = (i.totalram - i.totalhigh) << PAGE_SHIFT;
/*
* Aim for 1/4096 of memory per thread This gives 1MB on 4Gig
* machines, but only uses 32K on 128M machines. Bottom out at