| From d1d84c9626bb3a519863b3ffc40d347166f9fb83 Mon Sep 17 00:00:00 2001 |
| From: "J. Bruce Fields" <bfields@redhat.com> |
| Date: Thu, 21 Aug 2014 15:04:31 -0400 |
| Subject: nfsd4: fix response size estimation for OP_SEQUENCE |
| |
| From: "J. Bruce Fields" <bfields@redhat.com> |
| |
| commit d1d84c9626bb3a519863b3ffc40d347166f9fb83 upstream. |
| |
| We added this new estimator function but forgot to hook it up. The |
| effect is that NFSv4.1 (and greater) won't do zero-copy reads. |
| |
| The estimate was also wrong by 8 bytes. |
| |
| Fixes: ccae70a9ee41 "nfsd4: estimate sequence response size" |
| Reported-by: Chuck Lever <chucklever@gmail.com> |
| Signed-off-by: J. Bruce Fields <bfields@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfsd/nfs4proc.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/fs/nfsd/nfs4proc.c |
| +++ b/fs/nfsd/nfs4proc.c |
| @@ -1546,7 +1546,8 @@ static inline u32 nfsd4_rename_rsize(str |
| static inline u32 nfsd4_sequence_rsize(struct svc_rqst *rqstp, |
| struct nfsd4_op *op) |
| { |
| - return NFS4_MAX_SESSIONID_LEN + 20; |
| + return (op_encode_hdr_size |
| + + XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN) + 5) * sizeof(__be32); |
| } |
| |
| static inline u32 nfsd4_setattr_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) |
| @@ -1850,6 +1851,7 @@ static struct nfsd4_operation nfsd4_ops[ |
| .op_func = (nfsd4op_func)nfsd4_sequence, |
| .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_AS_FIRST_OP, |
| .op_name = "OP_SEQUENCE", |
| + .op_rsize_bop = (nfsd4op_rsize)nfsd4_sequence_rsize, |
| }, |
| [OP_DESTROY_CLIENTID] = { |
| .op_func = (nfsd4op_func)nfsd4_destroy_clientid, |
