diff options
| author | Mi Jinlong <mijinlong@cn.fujitsu.com> | 2011-03-10 17:43:37 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-03-16 11:10:22 -0400 |
| commit | d2b217439fd1d8f7857175f063113f4d1d66306c (patch) | |
| tree | 35d8c2463a53de77b20ae6d37807b04d33ecfedb /fs/nfsd | |
| parent | 0a5e5f122c756d1c1a6ca712eda76ea8664e5fd9 (diff) | |
| download | blackbird-op-linux-d2b217439fd1d8f7857175f063113f4d1d66306c.tar.gz blackbird-op-linux-d2b217439fd1d8f7857175f063113f4d1d66306c.zip | |
nfs41: make sure nfs server return right ca_maxresponsesize_cached
According to rfc5661,
ca_maxresponsesize_cached:
Like ca_maxresponsesize, but the maximum size of a reply that
will be stored in the reply cache (Section 2.10.6.1). For each
channel, the server MAY decrease this value, but MUST NOT
increase it.
the latest kernel(2.6.38-rc8) may increase the value for ignoring
request's ca_maxresponsesize_cached value. We should not ignore it.
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c26dc31fb943..a20827804c50 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -608,7 +608,8 @@ static void init_forechannel_attrs(struct nfsd4_channel_attrs *new, struct nfsd4 u32 maxrpc = nfsd_serv->sv_max_mesg; new->maxreqs = numslots; - new->maxresp_cached = slotsize + NFSD_MIN_HDR_SEQ_SZ; + new->maxresp_cached = min_t(u32, req->maxresp_cached, + slotsize + NFSD_MIN_HDR_SEQ_SZ); new->maxreq_sz = min_t(u32, req->maxreq_sz, maxrpc); new->maxresp_sz = min_t(u32, req->maxresp_sz, maxrpc); new->maxops = min_t(u32, req->maxops, NFSD_MAX_OPS_PER_COMPOUND); |
