NFSD: Simplify starting_len

[ Upstream commit 071ae99feadfc55979f89287d6ad2c6a315cb46d ]

Clean-up: Now that nfsd4_encode_readv() does not have to encode the
EOF or rd_length values, it no longer needs to subtract 8 from
@starting_len.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index b7a3c770d436bbd3a2f0807c1696fdc800e6ad87..310321b9b94cd283f14bed52094b23b537d5a5d6 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3947,7 +3947,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
                                 struct file *file, unsigned long maxcount)
 {
        struct xdr_stream *xdr = resp->xdr;
-       int starting_len = xdr->buf->len - 8;
+       unsigned int starting_len = xdr->buf->len;
        __be32 nfserr;
        __be32 tmp;
        int pad;
@@ -3962,14 +3962,13 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
        read->rd_length = maxcount;
        if (nfserr)
                return nfserr;
-       if (svc_encode_result_payload(resp->rqstp, starting_len + 8, maxcount))
+       if (svc_encode_result_payload(resp->rqstp, starting_len, maxcount))
                return nfserr_io;
-       xdr_truncate_encode(xdr, starting_len + 8 + xdr_align_size(maxcount));
+       xdr_truncate_encode(xdr, starting_len + xdr_align_size(maxcount));
 
        tmp = xdr_zero;
        pad = (maxcount&3) ? 4 - (maxcount&3) : 0;
-       write_bytes_to_xdr_buf(xdr->buf, starting_len + 8 + maxcount,
-                                                               &tmp, pad);
+       write_bytes_to_xdr_buf(xdr->buf, starting_len + maxcount, &tmp, pad);
        return 0;
 
 }