ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Update the NFSv2 READ result encoder to use struct xdr_stream

Browse Source 
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever
2020-10-23 16:40:11 -04:00
parent d9014b0f8f
commit a6f8d9dc9e
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfsd/nfsproc.c
View File

@@ -185,6 +185,7 @@ nfsd_proc_read(struct svc_rqst *rqstp)
v = 0; v = 0;
len = argp->count; len = argp->count;
resp->pages = rqstp->rq_next_page;
while (len > 0) { while (len > 0) {
struct page *page = *(rqstp->rq_next_page++); struct page *page = *(rqstp->rq_next_page++);

32
fs/nfsd/nfsxdr.c
View File

@@ -549,27 +549,25 @@ nfssvc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p)
int int
nfssvc_encode_readres(struct svc_rqst *rqstp, __be32 *p) nfssvc_encode_readres(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_res_stream;
struct nfsd_readres *resp = rqstp->rq_resp; struct nfsd_readres *resp = rqstp->rq_resp;
struct kvec *head = rqstp->rq_res.head; struct kvec *head = rqstp->rq_res.head;
*p++ = resp->status; if (!svcxdr_encode_stat(xdr, resp->status))
if (resp->status != nfs_ok)
return xdr_ressize_check(rqstp, p);
p = encode_fattr(rqstp, p, &resp->fh, &resp->stat);
*p++ = htonl(resp->count);
xdr_ressize_check(rqstp, p);
/* now update rqstp->rq_res to reflect data as well */
rqstp->rq_res.page_len = resp->count;
if (resp->count & 3) {
/* need to pad the tail */
rqstp->rq_res.tail[0].iov_base = p;
*p = 0;
rqstp->rq_res.tail[0].iov_len = 4 - (resp->count&3);
}
if (svc_encode_result_payload(rqstp, head->iov_len, resp->count))
return 0; return 0;
switch (resp->status) {
case nfs_ok:
if (!svcxdr_encode_fattr(rqstp, xdr, &resp->fh, &resp->stat))
return 0;
if (xdr_stream_encode_u32(xdr, resp->count) < 0)
return 0;
xdr_write_pages(xdr, resp->pages, rqstp->rq_res.page_base,
resp->count);
if (svc_encode_result_payload(rqstp, head->iov_len, resp->count) < 0)
return 0;
break;
}
return 1; return 1;
} }

1
fs/nfsd/xdr.h
View File

@@ -102,6 +102,7 @@ struct nfsd_readres {
struct svc_fh fh; struct svc_fh fh;
unsigned long count; unsigned long count;
struct kstat stat; struct kstat stat;
struct page **pages;
}; };
struct nfsd_readdirres { struct nfsd_readdirres {