openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd4: minor NFSv2/v3 write decoding cleanup 

Use a couple shortcuts that will simplify a following bugfix.

Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2017-04-25 16:21:34 -04:00
parent e6838a29ec
commit db44bac41b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfsd/nfs3xdr.c
View File

@ -358,6 +358,8 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
{ {
unsigned int len, v, hdr, dlen; unsigned int len, v, hdr, dlen;
u32 max_blocksize = svc_max_payload(rqstp); u32 max_blocksize = svc_max_payload(rqstp);
struct kvec *head = rqstp->rq_arg.head;
struct kvec *tail = rqstp->rq_arg.tail;
p = decode_fh(p, &args->fh); p = decode_fh(p, &args->fh);
if (!p) if (!p)
@ -377,9 +379,8 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
* Check to make sure that we got the right number of * Check to make sure that we got the right number of
* bytes. * bytes.
*/ */
hdr = (void*)p - rqstp->rq_arg.head[0].iov_base; hdr = (void*)p - head->iov_base;
dlen = rqstp->rq_arg.head[0].iov_len + rqstp->rq_arg.page_len dlen = head->iov_len + rqstp->rq_arg.page_len + tail->iov_len - hdr;
+ rqstp->rq_arg.tail[0].iov_len - hdr;
/* /*
* Round the length of the data which was specified up to * Round the length of the data which was specified up to
* the next multiple of XDR units and then compare that * the next multiple of XDR units and then compare that
@ -396,7 +397,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
len = args->len = max_blocksize; len = args->len = max_blocksize;
} }
rqstp->rq_vec[0].iov_base = (void*)p; rqstp->rq_vec[0].iov_base = (void*)p;
rqstp->rq_vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr; rqstp->rq_vec[0].iov_len = head->iov_len - hdr;
v = 0; v = 0;
while (len > rqstp->rq_vec[v].iov_len) { while (len > rqstp->rq_vec[v].iov_len) {
len -= rqstp->rq_vec[v].iov_len; len -= rqstp->rq_vec[v].iov_len;

8
fs/nfsd/nfsxdr.c
View File

@ -280,6 +280,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_writeargs *args) struct nfsd_writeargs *args)
{ {
unsigned int len, hdr, dlen; unsigned int len, hdr, dlen;
struct kvec *head = rqstp->rq_arg.head;
int v; int v;
p = decode_fh(p, &args->fh); p = decode_fh(p, &args->fh);
@ -300,9 +301,8 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
* Check to make sure that we got the right number of * Check to make sure that we got the right number of
* bytes. * bytes.
*/ */
hdr = (void*)p - rqstp->rq_arg.head[0].iov_base; hdr = (void*)p - head->iov_base;
dlen = rqstp->rq_arg.head[0].iov_len + rqstp->rq_arg.page_len dlen = head->iov_len + rqstp->rq_arg.page_len - hdr;
- hdr;
/* /*
* Round the length of the data which was specified up to * Round the length of the data which was specified up to
@ -316,7 +316,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
return 0; return 0;
rqstp->rq_vec[0].iov_base = (void*)p; rqstp->rq_vec[0].iov_base = (void*)p;
rqstp->rq_vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr; rqstp->rq_vec[0].iov_len = head->iov_len - hdr;
v = 0; v = 0;
while (len > rqstp->rq_vec[v].iov_len) { while (len > rqstp->rq_vec[v].iov_len) {
len -= rqstp->rq_vec[v].iov_len; len -= rqstp->rq_vec[v].iov_len;