diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-05-16 14:38:20 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-05-23 09:03:42 -0400 |
| commit | 622f560e6afbd54cdd9b9a416ddab8114baedd76 (patch) | |
| tree | f1663e3b871429c8a50e497bc841b3e986a9fd4c | |
| parent | 24906f32378288d74289405231ddbb7120317691 (diff) | |
nfsd4: read size estimate should include padding
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 2 |
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) | |||
| 1489 | if (rlen > maxcount) | 1489 | if (rlen > maxcount) |
| 1490 | rlen = maxcount; | 1490 | rlen = maxcount; |
| 1491 | 1491 | ||
| 1492 | return (op_encode_hdr_size + 2) * sizeof(__be32) + rlen; | 1492 | return (op_encode_hdr_size + 2 + XDR_QUADLEN(rlen)) * sizeof(__be32); |
| 1493 | } | 1493 | } |
| 1494 | 1494 | ||
| 1495 | static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) | 1495 | static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) |