[PATCH] knfsd: Prepare knfsd for support of rsize/wsize of up to 1MB, over TCP

The limit over UDP remains at 32K.  Also, make some of the apparently
arbitrary sizing constants clearer.

The biggest change here involves replacing NFSSVC_MAXBLKSIZE by a function of
the rqstp.  This allows it to be different for different protocols (udp/tcp)
and also allows it to depend on the servers declared sv_bufsiz.

Note that we don't actually increase sv_bufsz for nfs yet.  That comes next.

Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 0c4fab018791..a5ebc7dbb384 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -160,6 +160,7 @@ nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp,
                                         struct nfsd3_readres  *resp)
 {
         int     nfserr;
+        u32     max_blocksize = svc_max_payload(rqstp);
 
         dprintk("nfsd: READ(3) %s %lu bytes at %lu\n",
                                 SVCFH_fmt(&argp->fh),
@@ -172,8 +173,8 @@ nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp,
          */
 
         resp->count = argp->count;
-        if (NFSSVC_MAXBLKSIZE < resp->count)
-                resp->count = NFSSVC_MAXBLKSIZE;
+        if (max_blocksize < resp->count)
+                resp->count = max_blocksize;
 
         svc_reserve(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count +4);
 
@@ -538,15 +539,16 @@ nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle    *argp,
                                            struct nfsd3_fsinfores *resp)
 {
         int     nfserr;
+        u32     max_blocksize = svc_max_payload(rqstp);
 
         dprintk("nfsd: FSINFO(3)   %s\n",
                                 SVCFH_fmt(&argp->fh));
 
-        resp->f_rtmax  = NFSSVC_MAXBLKSIZE;
-        resp->f_rtpref = NFSSVC_MAXBLKSIZE;
+        resp->f_rtmax  = max_blocksize;
+        resp->f_rtpref = max_blocksize;
         resp->f_rtmult = PAGE_SIZE;
-        resp->f_wtmax  = NFSSVC_MAXBLKSIZE;
-        resp->f_wtpref = NFSSVC_MAXBLKSIZE;
+        resp->f_wtmax  = max_blocksize;
+        resp->f_wtpref = max_blocksize;
         resp->f_wtmult = PAGE_SIZE;
         resp->f_dtpref = PAGE_SIZE;
         resp->f_maxfilesize = ~(u32) 0;