nfsd4: read size estimate should include padding
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 16 May 2014 18:38:20 +0000 (14:38 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 23 May 2014 13:03:42 +0000 (09:03 -0400)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4proc.c

index 2c1ee70b730f86bcc554dbb273e13edfe958fa2f..77c43697cd4fa15f9ce7669e9da2e4d51608984f 100644 (file)
@@ -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)