Commit 35e13333 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Greg Kroah-Hartman

nfsd4: minor NFSv2/v3 write decoding cleanup

commit db44bac4 upstream.

Use a couple shortcuts that will simplify a following bugfix.

(Minor backporting required to account for a change from f34b9568
"The NFSv2/NFSv3 server does not handle zero length WRITE requests
correctly".)
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16fb859f
...@@ -358,6 +358,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, ...@@ -358,6 +358,7 @@ 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;
p = decode_fh(p, &args->fh); p = decode_fh(p, &args->fh);
if (!p) if (!p)
...@@ -377,9 +378,8 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, ...@@ -377,9 +378,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 - hdr;
- 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 +396,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, ...@@ -396,7 +396,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;
......
...@@ -280,6 +280,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, ...@@ -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, ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment