From 814d2ad60050a2ae2c3f3a6814d1edb1199dee52 Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Wed, 23 Sep 2009 21:32:21 -0400 Subject: [PATCH] --- yaml --- r: 177173 b: refs/heads/master c: ddc04fd4d5163aee9ebdb38a56c365b602e2b7b7 h: refs/heads/master i: 177171: 3212b58cde7b4451ecc2f75f635d4760e19d4c70 v: v3 --- [refs] | 2 +- trunk/Documentation/filesystems/nfs41-server.txt | 7 +++++++ trunk/fs/nfsd/nfs4state.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 36db5fca9bb7..1d30755b9646 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f39bde24b275ddc45df1ed835725b609e178c7a0 +refs/heads/master: ddc04fd4d5163aee9ebdb38a56c365b602e2b7b7 diff --git a/trunk/Documentation/filesystems/nfs41-server.txt b/trunk/Documentation/filesystems/nfs41-server.txt index 1f95e7731886..1bd0d0c05171 100644 --- a/trunk/Documentation/filesystems/nfs41-server.txt +++ b/trunk/Documentation/filesystems/nfs41-server.txt @@ -213,3 +213,10 @@ The following cases aren't supported yet: DESTROY_CLIENTID, DESTROY_SESSION, EXCHANGE_ID. * DESTROY_SESSION MUST be the final operation in the COMPOUND request. +Nonstandard compound limitations: +* No support for a sessions fore channel RPC compound that requires both a + ca_maxrequestsize request and a ca_maxresponsesize reply, so we may + fail to live up to the promise we made in CREATE_SESSION fore channel + negotiation. +* No more than one IO operation (read, write, readdir) allowed per + compound. diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 2153f9bdbebd..fcb9817881a1 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -477,13 +477,14 @@ static int set_forechannel_drc_size(struct nfsd4_channel_attrs *fchan) /* * fchan holds the client values on input, and the server values on output + * sv_max_mesg is the maximum payload plus one page for overhead. */ static int init_forechannel_attrs(struct svc_rqst *rqstp, struct nfsd4_channel_attrs *session_fchan, struct nfsd4_channel_attrs *fchan) { int status = 0; - __u32 maxcount = svc_max_payload(rqstp); + __u32 maxcount = nfsd_serv->sv_max_mesg; /* headerpadsz set to zero in encode routine */