diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-03-10 20:50:31 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-03-28 21:24:56 -0400 |
| commit | 1bc49d83c37cfaf46be357757e592711e67f9809 (patch) | |
| tree | db24c30670d00441e881656f0d3b33d545fe3b72 /fs/nfsd | |
| parent | 480efaee085235bb848f1063f959bf144103c342 (diff) | |
| download | op-kernel-dev-1bc49d83c37cfaf46be357757e592711e67f9809.zip op-kernel-dev-1bc49d83c37cfaf46be357757e592711e67f9809.tar.gz | |
nfsd4: fix nfs4err_resource in 4.1 case
encode_getattr, for example, can return nfserr_resource to indicate it
ran out of buffer space. That's not a legal error in the 4.1 case. And
in the 4.1 case, if we ran out of buffer space, we should have exceeded
a session limit too.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 94b7f19..4c247c1 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3625,6 +3625,14 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op) /* nfsd4_check_resp_size guarantees enough room for error status */ if (!op->status) op->status = nfsd4_check_resp_size(resp, 0); + if (op->status == nfserr_resource && nfsd4_has_session(&resp->cstate)) { + struct nfsd4_slot *slot = resp->cstate.slot; + + if (slot->sl_flags & NFSD4_SLOT_CACHETHIS) + op->status = nfserr_rep_too_big_to_cache; + else + op->status = nfserr_rep_too_big; + } if (so) { so->so_replay.rp_status = op->status; so->so_replay.rp_buflen = (char *)resp->p - (char *)(statp+1); |
