diff options
Diffstat (limited to 'fs/nfsd/nfs3xdr.c')
-rw-r--r-- | fs/nfsd/nfs3xdr.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 20ba728a4642..4b9aefbcc93c 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c | |||
@@ -344,9 +344,9 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, u32 *p, | |||
344 | v=0; | 344 | v=0; |
345 | while (len > 0) { | 345 | while (len > 0) { |
346 | pn = rqstp->rq_resused++; | 346 | pn = rqstp->rq_resused++; |
347 | args->vec[v].iov_base = page_address(rqstp->rq_respages[pn]); | 347 | rqstp->rq_vec[v].iov_base = page_address(rqstp->rq_respages[pn]); |
348 | args->vec[v].iov_len = len < PAGE_SIZE? len : PAGE_SIZE; | 348 | rqstp->rq_vec[v].iov_len = len < PAGE_SIZE? len : PAGE_SIZE; |
349 | len -= args->vec[v].iov_len; | 349 | len -= rqstp->rq_vec[v].iov_len; |
350 | v++; | 350 | v++; |
351 | } | 351 | } |
352 | args->vlen = v; | 352 | args->vlen = v; |
@@ -372,22 +372,22 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, | |||
372 | rqstp->rq_arg.len - hdr < len) | 372 | rqstp->rq_arg.len - hdr < len) |
373 | return 0; | 373 | return 0; |
374 | 374 | ||
375 | args->vec[0].iov_base = (void*)p; | 375 | rqstp->rq_vec[0].iov_base = (void*)p; |
376 | args->vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr; | 376 | rqstp->rq_vec[0].iov_len = rqstp->rq_arg.head[0].iov_len - hdr; |
377 | 377 | ||
378 | if (len > NFSSVC_MAXBLKSIZE) | 378 | if (len > NFSSVC_MAXBLKSIZE) |
379 | len = NFSSVC_MAXBLKSIZE; | 379 | len = NFSSVC_MAXBLKSIZE; |
380 | v= 0; | 380 | v= 0; |
381 | while (len > args->vec[v].iov_len) { | 381 | while (len > rqstp->rq_vec[v].iov_len) { |
382 | len -= args->vec[v].iov_len; | 382 | len -= rqstp->rq_vec[v].iov_len; |
383 | v++; | 383 | v++; |
384 | args->vec[v].iov_base = page_address(rqstp->rq_pages[v]); | 384 | rqstp->rq_vec[v].iov_base = page_address(rqstp->rq_pages[v]); |
385 | args->vec[v].iov_len = PAGE_SIZE; | 385 | rqstp->rq_vec[v].iov_len = PAGE_SIZE; |
386 | } | 386 | } |
387 | args->vec[v].iov_len = len; | 387 | rqstp->rq_vec[v].iov_len = len; |
388 | args->vlen = v+1; | 388 | args->vlen = v+1; |
389 | 389 | ||
390 | return args->count == args->len && args->vec[0].iov_len > 0; | 390 | return args->count == args->len && rqstp->rq_vec[0].iov_len > 0; |
391 | } | 391 | } |
392 | 392 | ||
393 | int | 393 | int |