dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

nfsd4: cleanup: replace rq_resused count by rq_next_page pointer 

It may be a matter of personal taste, but I find this makes the code
clearer.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-12-10 18:01:37 -05:00
parent 79f77bf9a4
commit afc59400d6
12 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/nfs2acl.c
View File

@ -253,7 +253,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
(resp->mask & NFS_ACL) ? resp->acl_access : NULL, (resp->mask & NFS_ACL) ? resp->acl_access : NULL,
(resp->mask & NFS_DFACL) ? resp->acl_default : NULL); (resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
while (w > 0) { while (w > 0) {
if (!rqstp->rq_respages[rqstp->rq_resused++]) if (!*(rqstp->rq_next_page++))
return 0; return 0;
w -= PAGE_SIZE; w -= PAGE_SIZE;
} }

2
fs/nfsd/nfs3acl.c
View File

@ -184,7 +184,7 @@ static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
(resp->mask & NFS_ACL) ? resp->acl_access : NULL, (resp->mask & NFS_ACL) ? resp->acl_access : NULL,
(resp->mask & NFS_DFACL) ? resp->acl_default : NULL); (resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
while (w > 0) { while (w > 0) {
if (!rqstp->rq_respages[rqstp->rq_resused++]) if (!*(rqstp->rq_next_page++))
return 0; return 0;
w -= PAGE_SIZE; w -= PAGE_SIZE;
} }

6
fs/nfsd/nfs3proc.c
View File

@ -460,7 +460,7 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp,
__be32 nfserr; __be32 nfserr;
int count = 0; int count = 0;
loff_t offset; loff_t offset;
int i; struct page **p;
caddr_t page_addr = NULL; caddr_t page_addr = NULL;
dprintk("nfsd: READDIR+(3) %s %d bytes at %d\n", dprintk("nfsd: READDIR+(3) %s %d bytes at %d\n",
@ -484,8 +484,8 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp,
&resp->common, &resp->common,
nfs3svc_encode_entry_plus); nfs3svc_encode_entry_plus);
memcpy(resp->verf, argp->verf, 8); memcpy(resp->verf, argp->verf, 8);
for (i=1; i<rqstp->rq_resused ; i++) { for (p = rqstp->rq_respages + 1; p < rqstp->rq_next_page; p++) {
page_addr = page_address(rqstp->rq_respages[i]); page_addr = page_address(*p);
if (((caddr_t)resp->buffer >= page_addr) && if (((caddr_t)resp->buffer >= page_addr) &&
((caddr_t)resp->buffer < page_addr + PAGE_SIZE)) { ((caddr_t)resp->buffer < page_addr + PAGE_SIZE)) {

33
fs/nfsd/nfs3xdr.c
View File

@ -325,7 +325,7 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_readargs *args) struct nfsd3_readargs *args)
{ {
unsigned int len; unsigned int len;
int v,pn; int v;
u32 max_blocksize = svc_max_payload(rqstp); u32 max_blocksize = svc_max_payload(rqstp);
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
@ -340,8 +340,9 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
/* set up the kvec */ /* set up the kvec */
v=0; v=0;
while (len > 0) { while (len > 0) {
pn = rqstp->rq_resused++; struct page *p = *(rqstp->rq_next_page++);
rqstp->rq_vec[v].iov_base = page_address(rqstp->rq_respages[pn]);
rqstp->rq_vec[v].iov_base = page_address(p);
rqstp->rq_vec[v].iov_len = len < PAGE_SIZE? len : PAGE_SIZE; rqstp->rq_vec[v].iov_len = len < PAGE_SIZE? len : PAGE_SIZE;
len -= rqstp->rq_vec[v].iov_len; len -= rqstp->rq_vec[v].iov_len;
v++; v++;
@ -463,8 +464,7 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p,
len = ntohl(*p++); len = ntohl(*p++);
if (len == 0 || len > NFS3_MAXPATHLEN || len >= PAGE_SIZE) if (len == 0 || len > NFS3_MAXPATHLEN || len >= PAGE_SIZE)
return 0; return 0;
args->tname = new = args->tname = new = page_address(*(rqstp->rq_next_page++));
page_address(rqstp->rq_respages[rqstp->rq_resused++]);
args->tlen = len; args->tlen = len;
/* first copy and check from the first page */ /* first copy and check from the first page */
old = (char*)p; old = (char*)p;
@ -535,8 +535,7 @@ nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p,
{ {
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
return 0; return 0;
args->buffer = args->buffer = page_address(*(rqstp->rq_next_page++));
page_address(rqstp->rq_respages[rqstp->rq_resused++]);
return xdr_argsize_check(rqstp, p); return xdr_argsize_check(rqstp, p);
} }
@ -567,8 +566,7 @@ nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p,
if (args->count > PAGE_SIZE) if (args->count > PAGE_SIZE)
args->count = PAGE_SIZE; args->count = PAGE_SIZE;
args->buffer = args->buffer = page_address(*(rqstp->rq_next_page++));
page_address(rqstp->rq_respages[rqstp->rq_resused++]);
return xdr_argsize_check(rqstp, p); return xdr_argsize_check(rqstp, p);
} }
@ -577,7 +575,7 @@ int
nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p, nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_readdirargs *args) struct nfsd3_readdirargs *args)
{ {
int len, pn; int len;
u32 max_blocksize = svc_max_payload(rqstp); u32 max_blocksize = svc_max_payload(rqstp);
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
@ -592,9 +590,9 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p,
args->count = len; args->count = len;
while (len > 0) { while (len > 0) {
pn = rqstp->rq_resused++; struct page *p = *(rqstp->rq_next_page++);
if (!args->buffer) if (!args->buffer)
args->buffer = page_address(rqstp->rq_respages[pn]); args->buffer = page_address(p);
len -= PAGE_SIZE; len -= PAGE_SIZE;
} }
@ -880,7 +878,7 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
common); common);
__be32 *p = cd->buffer; __be32 *p = cd->buffer;
caddr_t curr_page_addr = NULL; caddr_t curr_page_addr = NULL;
int pn; /* current page number */ struct page ** page;
int slen; /* string (name) length */ int slen; /* string (name) length */
int elen; /* estimated entry length in words */ int elen; /* estimated entry length in words */
int num_entry_words = 0; /* actual number of words */ int num_entry_words = 0; /* actual number of words */
@ -917,8 +915,9 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
} }
/* determine which page in rq_respages[] we are currently filling */ /* determine which page in rq_respages[] we are currently filling */
for (pn=1; pn < cd->rqstp->rq_resused; pn++) { for (page = cd->rqstp->rq_respages + 1;
curr_page_addr = page_address(cd->rqstp->rq_respages[pn]); page < cd->rqstp->rq_next_page; page++) {
curr_page_addr = page_address(*page);
if (((caddr_t)cd->buffer >= curr_page_addr) && if (((caddr_t)cd->buffer >= curr_page_addr) &&
((caddr_t)cd->buffer < curr_page_addr + PAGE_SIZE)) ((caddr_t)cd->buffer < curr_page_addr + PAGE_SIZE))
@ -933,14 +932,14 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
if (plus) if (plus)
p = encode_entryplus_baggage(cd, p, name, namlen); p = encode_entryplus_baggage(cd, p, name, namlen);
num_entry_words = p - cd->buffer; num_entry_words = p - cd->buffer;
} else if (cd->rqstp->rq_respages[pn+1] != NULL) { } else if (*(page+1) != NULL) {
/* temporarily encode entry into next page, then move back to /* temporarily encode entry into next page, then move back to
* current and next page in rq_respages[] */ * current and next page in rq_respages[] */
__be32 *p1, *tmp; __be32 *p1, *tmp;
int len1, len2; int len1, len2;
/* grab next page for temporary storage of entry */ /* grab next page for temporary storage of entry */
p1 = tmp = page_address(cd->rqstp->rq_respages[pn+1]); p1 = tmp = page_address(*(page+1));
p1 = encode_entry_baggage(cd, p1, name, namlen, ino); p1 = encode_entry_baggage(cd, p1, name, namlen, ino);

24
fs/nfsd/nfs4xdr.c
View File

@ -2906,7 +2906,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
struct nfsd4_read *read) struct nfsd4_read *read)
{ {
u32 eof; u32 eof;
int v, pn; int v;
struct page *page;
unsigned long maxcount; unsigned long maxcount;
long len; long len;
__be32 *p; __be32 *p;
@ -2925,16 +2926,15 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
len = maxcount; len = maxcount;
v = 0; v = 0;
while (len > 0) { while (len > 0) {
pn = resp->rqstp->rq_resused; page = *(resp->rqstp->rq_next_page);
if (!resp->rqstp->rq_respages[pn]) { /* ran out of pages */ if (!page) { /* ran out of pages */
maxcount -= len; maxcount -= len;
break; break;
} }
resp->rqstp->rq_vec[v].iov_base = resp->rqstp->rq_vec[v].iov_base = page_address(page);
page_address(resp->rqstp->rq_respages[pn]);
resp->rqstp->rq_vec[v].iov_len = resp->rqstp->rq_vec[v].iov_len =
len < PAGE_SIZE ? len : PAGE_SIZE; len < PAGE_SIZE ? len : PAGE_SIZE;
resp->rqstp->rq_resused++; resp->rqstp->rq_next_page++;
v++; v++;
len -= PAGE_SIZE; len -= PAGE_SIZE;
} }
@ -2980,10 +2980,10 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd
return nfserr; return nfserr;
if (resp->xbuf->page_len) if (resp->xbuf->page_len)
return nfserr_resource; return nfserr_resource;
if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused]) if (!*resp->rqstp->rq_next_page)
return nfserr_resource; return nfserr_resource;
page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused++]); page = page_address(*(resp->rqstp->rq_next_page++));
maxcount = PAGE_SIZE; maxcount = PAGE_SIZE;
RESERVE_SPACE(4); RESERVE_SPACE(4);
@ -3031,7 +3031,7 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
return nfserr; return nfserr;
if (resp->xbuf->page_len) if (resp->xbuf->page_len)
return nfserr_resource; return nfserr_resource;
if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused]) if (!*resp->rqstp->rq_next_page)
return nfserr_resource; return nfserr_resource;
RESERVE_SPACE(NFS4_VERIFIER_SIZE); RESERVE_SPACE(NFS4_VERIFIER_SIZE);
@ -3059,7 +3059,7 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
goto err_no_verf; goto err_no_verf;
} }
page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused++]); page = page_address(*(resp->rqstp->rq_next_page++));
readdir->common.err = 0; readdir->common.err = 0;
readdir->buflen = maxcount; readdir->buflen = maxcount;
readdir->buffer = page; readdir->buffer = page;
@ -3082,8 +3082,8 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
p = readdir->buffer; p = readdir->buffer;
*p++ = 0; /* no more entries */ *p++ = 0; /* no more entries */
*p++ = htonl(readdir->common.err == nfserr_eof); *p++ = htonl(readdir->common.err == nfserr_eof);
resp->xbuf->page_len = ((char*)p) - (char*)page_address( resp->xbuf->page_len = ((char*)p) -
resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]); (char*)page_address(*(resp->rqstp->rq_next_page-1));
/* Use rest of head for padding and remaining ops: */ /* Use rest of head for padding and remaining ops: */
resp->xbuf->tail[0].iov_base = tailbase; resp->xbuf->tail[0].iov_base = tailbase;

11
fs/nfsd/nfsxdr.c
View File

@ -246,7 +246,7 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_readargs *args) struct nfsd_readargs *args)
{ {
unsigned int len; unsigned int len;
int v,pn; int v;
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
return 0; return 0;
@ -262,8 +262,9 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
*/ */
v=0; v=0;
while (len > 0) { while (len > 0) {
pn = rqstp->rq_resused++; struct page *p = *(rqstp->rq_next_page++);
rqstp->rq_vec[v].iov_base = page_address(rqstp->rq_respages[pn]);
rqstp->rq_vec[v].iov_base = page_address(p);
rqstp->rq_vec[v].iov_len = len < PAGE_SIZE?len:PAGE_SIZE; rqstp->rq_vec[v].iov_len = len < PAGE_SIZE?len:PAGE_SIZE;
len -= rqstp->rq_vec[v].iov_len; len -= rqstp->rq_vec[v].iov_len;
v++; v++;
@ -355,7 +356,7 @@ nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd_readli
{ {
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
return 0; return 0;
args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused++]); args->buffer = page_address(*(rqstp->rq_next_page++));
return xdr_argsize_check(rqstp, p); return xdr_argsize_check(rqstp, p);
} }
@ -396,7 +397,7 @@ nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p,
if (args->count > PAGE_SIZE) if (args->count > PAGE_SIZE)
args->count = PAGE_SIZE; args->count = PAGE_SIZE;
args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused++]); args->buffer = page_address(*(rqstp->rq_next_page++));
return xdr_argsize_check(rqstp, p); return xdr_argsize_check(rqstp, p);
} }

18
fs/nfsd/vfs.c
View File

@ -886,7 +886,7 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
struct splice_desc *sd) struct splice_desc *sd)
{ {
struct svc_rqst *rqstp = sd->u.data; struct svc_rqst *rqstp = sd->u.data;
struct page **pp = rqstp->rq_respages + rqstp->rq_resused; struct page **pp = rqstp->rq_next_page;
struct page *page = buf->page; struct page *page = buf->page;
size_t size; size_t size;
@ -894,17 +894,15 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
if (rqstp->rq_res.page_len == 0) { if (rqstp->rq_res.page_len == 0) {
get_page(page); get_page(page);
put_page(*pp); put_page(*rqstp->rq_next_page);
*pp = page; *(rqstp->rq_next_page++) = page;
rqstp->rq_resused++;
rqstp->rq_res.page_base = buf->offset; rqstp->rq_res.page_base = buf->offset;
rqstp->rq_res.page_len = size; rqstp->rq_res.page_len = size;
} else if (page != pp[-1]) { } else if (page != pp[-1]) {
get_page(page); get_page(page);
if (*pp) if (*rqstp->rq_next_page)
put_page(*pp); put_page(*rqstp->rq_next_page);
*pp = page; *(rqstp->rq_next_page++) = page;
rqstp->rq_resused++;
rqstp->rq_res.page_len += size; rqstp->rq_res.page_len += size;
} else } else
rqstp->rq_res.page_len += size; rqstp->rq_res.page_len += size;
@ -936,8 +934,8 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
.u.data = rqstp, .u.data = rqstp,
}; };
WARN_ON_ONCE(rqstp->rq_resused != 1); WARN_ON_ONCE(rqstp->rq_next_page != rqstp->rq_respages + 1);
rqstp->rq_resused = 1; rqstp->rq_next_page = rqstp->rq_respages + 1;
host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor); host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor);
} else { } else {
oldfs = get_fs(); oldfs = get_fs();

6
include/linux/sunrpc/svc.h
View File

@ -243,6 +243,7 @@ struct svc_rqst {
struct page * rq_pages[RPCSVC_MAXPAGES]; struct page * rq_pages[RPCSVC_MAXPAGES];
struct page * *rq_respages; /* points into rq_pages */ struct page * *rq_respages; /* points into rq_pages */
int rq_resused; /* number of pages used for result */ int rq_resused; /* number of pages used for result */
struct page * *rq_next_page; /* next reply page to use */
struct kvec rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */ struct kvec rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */
@ -338,9 +339,8 @@ xdr_ressize_check(struct svc_rqst *rqstp, __be32 *p)
static inline void svc_free_res_pages(struct svc_rqst *rqstp) static inline void svc_free_res_pages(struct svc_rqst *rqstp)
{ {
while (rqstp->rq_resused) { while (rqstp->rq_next_page != rqstp->rq_respages) {
struct page **pp = (rqstp->rq_respages + struct page **pp = --rqstp->rq_next_page;
--rqstp->rq_resused);
if (*pp) { if (*pp) {
put_page(*pp); put_page(*pp);
*pp = NULL; *pp = NULL;

2
net/sunrpc/svc.c
View File

@ -1297,7 +1297,7 @@ svc_process(struct svc_rqst *rqstp)
* Setup response xdr_buf. * Setup response xdr_buf.
* Initially it has just one page * Initially it has just one page
*/ */
rqstp->rq_resused = 1; rqstp->rq_next_page = &rqstp->rq_respages[1];
resv->iov_base = page_address(rqstp->rq_respages[0]); resv->iov_base = page_address(rqstp->rq_respages[0]);
resv->iov_len = 0; resv->iov_len = 0;
rqstp->rq_res.pages = rqstp->rq_respages + 1; rqstp->rq_res.pages = rqstp->rq_respages + 1;

2
net/sunrpc/svcsock.c
View File

@ -601,6 +601,7 @@ static int svc_udp_recvfrom(struct svc_rqst *rqstp)
rqstp->rq_respages = rqstp->rq_pages + 1 + rqstp->rq_respages = rqstp->rq_pages + 1 +
DIV_ROUND_UP(rqstp->rq_arg.page_len, PAGE_SIZE); DIV_ROUND_UP(rqstp->rq_arg.page_len, PAGE_SIZE);
} }
rqstp->rq_next_page = rqstp->rq_respages+1;
if (serv->sv_stats) if (serv->sv_stats)
serv->sv_stats->netudpcnt++; serv->sv_stats->netudpcnt++;
@ -1066,6 +1067,7 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
svsk->sk_datalen + want); svsk->sk_datalen + want);
rqstp->rq_respages = &rqstp->rq_pages[pnum]; rqstp->rq_respages = &rqstp->rq_pages[pnum];
rqstp->rq_next_page = rqstp->rq_respages + 1;
/* Now receive data */ /* Now receive data */
len = svc_partial_recvfrom(rqstp, vec, pnum, want, base); len = svc_partial_recvfrom(rqstp, vec, pnum, want, base);

10
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
View File

@ -521,11 +521,11 @@ next_sge:
rqstp->rq_pages[ch_no] = NULL; rqstp->rq_pages[ch_no] = NULL;
/* /*
* Detach res pages. svc_release must see a resused count of * Detach res pages. If svc_release sees any it will attempt to
* zero or it will attempt to put them. * put them.
*/ */
while (rqstp->rq_resused) while (rqstp->rq_next_page != rqstp->rq_respages)
rqstp->rq_respages[--rqstp->rq_resused] = NULL; *(--rqstp->rq_next_page) = NULL;
return err; return err;
} }
@ -550,7 +550,7 @@ static int rdma_read_complete(struct svc_rqst *rqstp,
/* rq_respages starts after the last arg page */ /* rq_respages starts after the last arg page */
rqstp->rq_respages = &rqstp->rq_arg.pages[page_no]; rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
rqstp->rq_resused = 0; rqstp->rq_next_page = &rqstp->rq_arg.pages[page_no];
/* Rebuild rq_arg head and tail. */ /* Rebuild rq_arg head and tail. */
rqstp->rq_arg.head[0] = head->arg.head[0]; rqstp->rq_arg.head[0] = head->arg.head[0];

4
net/sunrpc/xprtrdma/svc_rdma_sendto.c
View File

@ -548,6 +548,7 @@ static int send_reply(struct svcxprt_rdma *rdma,
int sge_no; int sge_no;
int sge_bytes; int sge_bytes;
int page_no; int page_no;
int pages;
int ret; int ret;
/* Post a recv buffer to handle another request. */ /* Post a recv buffer to handle another request. */
@ -611,7 +612,8 @@ static int send_reply(struct svcxprt_rdma *rdma,
* respages array. They are our pages until the I/O * respages array. They are our pages until the I/O
* completes. * completes.
*/ */
for (page_no = 0; page_no < rqstp->rq_resused; page_no++) { pages = rqstp->rq_next_page - rqstp->rq_respages;
for (page_no = 0; page_no < pages; page_no++) {
ctxt->pages[page_no+1] = rqstp->rq_respages[page_no]; ctxt->pages[page_no+1] = rqstp->rq_respages[page_no];
ctxt->count++; ctxt->count++;
rqstp->rq_respages[page_no] = NULL; rqstp->rq_respages[page_no] = NULL;