evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd4: move more write parameters into xdr argument

Browse source 
In preparation for moving some of this elsewhere.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-11-16 14:16:46 -05:00
parent 5a80a54d21
commit 70cc7f75b1
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fs/nfsd/nfs4xdr.c
View file

@ -1139,16 +1139,17 @@ nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify
DECODE_TAIL; DECODE_TAIL;
} }
static int fill_in_write_vector(struct kvec *vec, struct kvec *head, struct page **pagelist, int buflen) static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write)
{ {
int i = 1; int i = 1;
int buflen = write->wr_buflen;
vec[0].iov_base = head->iov_base; vec[0].iov_base = write->wr_head.iov_base;
vec[0].iov_len = min_t(int, buflen, head->iov_len); vec[0].iov_len = min_t(int, buflen, write->wr_head.iov_len);
buflen -= vec[0].iov_len; buflen -= vec[0].iov_len;
while (buflen) { while (buflen) {
vec[i].iov_base = page_address(pagelist[i - 1]); vec[i].iov_base = page_address(write->wr_pagelist[i - 1]);
vec[i].iov_len = min_t(int, PAGE_SIZE, buflen); vec[i].iov_len = min_t(int, PAGE_SIZE, buflen);
buflen -= vec[i].iov_len; buflen -= vec[i].iov_len;
i++; i++;
@ -1161,8 +1162,6 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write)
{ {
int avail; int avail;
int len; int len;
struct page **pagelist;
struct kvec head;
DECODE_HEAD; DECODE_HEAD;
status = nfsd4_decode_stateid(argp, &write->wr_stateid); status = nfsd4_decode_stateid(argp, &write->wr_stateid);
@ -1185,10 +1184,10 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write)
__FILE__, __LINE__); __FILE__, __LINE__);
goto xdr_error; goto xdr_error;
} }
head.iov_base = p; write->wr_head.iov_base = p;
head.iov_len = avail; write->wr_head.iov_len = avail;
WARN_ON(avail != (XDR_QUADLEN(avail) << 2)); WARN_ON(avail != (XDR_QUADLEN(avail) << 2));
pagelist = argp->pagelist; write->wr_pagelist = argp->pagelist;
len = XDR_QUADLEN(write->wr_buflen) << 2; len = XDR_QUADLEN(write->wr_buflen) << 2;
if (len >= avail) { if (len >= avail) {
@ -1205,8 +1204,7 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write)
argp->end = argp->p + XDR_QUADLEN(PAGE_SIZE); argp->end = argp->p + XDR_QUADLEN(PAGE_SIZE);
} }
argp->p += XDR_QUADLEN(len); argp->p += XDR_QUADLEN(len);
write->wr_vlen = fill_in_write_vector(argp->rqstp->rq_vec, write->wr_vlen = fill_in_write_vector(argp->rqstp->rq_vec, write);
&head, pagelist, write->wr_buflen);
WARN_ON_ONCE(write->wr_vlen > ARRAY_SIZE(argp->rqstp->rq_vec)); WARN_ON_ONCE(write->wr_vlen > ARRAY_SIZE(argp->rqstp->rq_vec));
DECODE_TAIL; DECODE_TAIL;

2
fs/nfsd/xdr4.h
View file

@ -386,6 +386,8 @@ struct nfsd4_write {
u32 wr_stable_how; /* request */ u32 wr_stable_how; /* request */
u32 wr_buflen; /* request */ u32 wr_buflen; /* request */
int wr_vlen; int wr_vlen;
struct kvec wr_head;
struct page ** wr_pagelist; /* request */
u32 wr_bytes_written; /* response */ u32 wr_bytes_written; /* response */
u32 wr_how_written; /* response */ u32 wr_how_written; /* response */