summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4proc.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-05-16 20:38:20 +0200
committerJ. Bruce Fields <bfields@redhat.com>2014-05-23 15:03:42 +0200
commit622f560e6afbd54cdd9b9a416ddab8114baedd76 (patch)
treef1663e3b871429c8a50e497bc841b3e986a9fd4c /fs/nfsd/nfs4proc.c
parentnfsd4: allow larger 4.1 session drc slots (diff)
downloadlinux-622f560e6afbd54cdd9b9a416ddab8114baedd76.tar.xz
linux-622f560e6afbd54cdd9b9a416ddab8114baedd76.zip
nfsd4: read size estimate should include padding
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to '')
-rw-r--r--fs/nfsd/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 2c1ee70b730f..77c43697cd4f 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1489,7 +1489,7 @@ static inline u32 nfsd4_read_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
if (rlen > maxcount)
rlen = maxcount;
- return (op_encode_hdr_size + 2) * sizeof(__be32) + rlen;
+ return (op_encode_hdr_size + 2 + XDR_QUADLEN(rlen)) * sizeof(__be32);
}
static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)