korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-08 03:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Simplify starting_len

Browse Source 
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>
This commit is contained in:
Chuck Lever 2022-07-22 16:09:10 -04:00
parent 28d5bc468e
commit 071ae99fea
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfsd/nfs4xdr.c
View File

@ -3939,7 +3939,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
struct file *file, unsigned long maxcount) struct file *file, unsigned long maxcount)
{ {
struct xdr_stream *xdr = resp->xdr; struct xdr_stream *xdr = resp->xdr;
int starting_len = xdr->buf->len - 8; unsigned int starting_len = xdr->buf->len;
__be32 nfserr; __be32 nfserr;
__be32 tmp; __be32 tmp;
int pad; int pad;
@ -3954,14 +3954,13 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
read->rd_length = maxcount; read->rd_length = maxcount;
if (nfserr) if (nfserr)
return 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; 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; tmp = xdr_zero;
pad = (maxcount&3) ? 4 - (maxcount&3) : 0; pad = (maxcount&3) ? 4 - (maxcount&3) : 0;
write_bytes_to_xdr_buf(xdr->buf, starting_len + 8 + maxcount, write_bytes_to_xdr_buf(xdr->buf, starting_len + maxcount, &tmp, pad);
&tmp, pad);
return 0; return 0;
} }