Commit e4ccfe30 authored by Chuck Lever's avatar Chuck Lever

NFSD: Update the NFSv3 READDIR3res encoder to use struct xdr_stream

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent a1409e2d
...@@ -447,7 +447,8 @@ static void nfsd3_init_dirlist_pages(struct svc_rqst *rqstp, ...@@ -447,7 +447,8 @@ static void nfsd3_init_dirlist_pages(struct svc_rqst *rqstp,
* and reserve room for the NULL ptr & eof flag (-2 words) */ * and reserve room for the NULL ptr & eof flag (-2 words) */
resp->buflen = (count >> 2) - 2; resp->buflen = (count >> 2) - 2;
resp->buffer = page_address(*rqstp->rq_next_page); resp->pages = rqstp->rq_next_page;
resp->buffer = page_address(*resp->pages);
while (count > 0) { while (count > 0) {
rqstp->rq_next_page++; rqstp->rq_next_page++;
count -= PAGE_SIZE; count -= PAGE_SIZE;
......
...@@ -158,6 +158,19 @@ encode_fh(__be32 *p, struct svc_fh *fhp) ...@@ -158,6 +158,19 @@ encode_fh(__be32 *p, struct svc_fh *fhp)
return p + XDR_QUADLEN(size); return p + XDR_QUADLEN(size);
} }
static bool
svcxdr_encode_cookieverf3(struct xdr_stream *xdr, const __be32 *verf)
{
__be32 *p;
p = xdr_reserve_space(xdr, NFS3_COOKIEVERFSIZE);
if (!p)
return false;
memcpy(p, verf, NFS3_COOKIEVERFSIZE);
return true;
}
static bool static bool
svcxdr_encode_writeverf3(struct xdr_stream *xdr, const __be32 *verf) svcxdr_encode_writeverf3(struct xdr_stream *xdr, const __be32 *verf)
{ {
...@@ -1124,27 +1137,30 @@ nfs3svc_encode_linkres(struct svc_rqst *rqstp, __be32 *p) ...@@ -1124,27 +1137,30 @@ nfs3svc_encode_linkres(struct svc_rqst *rqstp, __be32 *p)
int int
nfs3svc_encode_readdirres(struct svc_rqst *rqstp, __be32 *p) nfs3svc_encode_readdirres(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_res_stream;
struct nfsd3_readdirres *resp = rqstp->rq_resp; struct nfsd3_readdirres *resp = rqstp->rq_resp;
*p++ = resp->status; if (!svcxdr_encode_nfsstat3(xdr, resp->status))
p = encode_post_op_attr(rqstp, p, &resp->fh); return 0;
switch (resp->status) {
if (resp->status == 0) { case nfs_ok:
/* stupid readdir cookie */ if (!svcxdr_encode_post_op_attr(rqstp, xdr, &resp->fh))
memcpy(p, resp->verf, 8); p += 2; return 0;
xdr_ressize_check(rqstp, p); if (!svcxdr_encode_cookieverf3(xdr, resp->verf))
if (rqstp->rq_res.head[0].iov_len + (2<<2) > PAGE_SIZE) return 0;
return 1; /*No room for trailer */ xdr_write_pages(xdr, resp->pages, 0, resp->count << 2);
rqstp->rq_res.page_len = (resp->count) << 2; /* no more entries */
if (xdr_stream_encode_item_absent(xdr) < 0)
/* add the 'tail' to the end of the 'head' page - page 0. */ return 0;
rqstp->rq_res.tail[0].iov_base = p; if (xdr_stream_encode_bool(xdr, resp->common.err == nfserr_eof) < 0)
*p++ = 0; /* no more entries */ return 0;
*p++ = htonl(resp->common.err == nfserr_eof); break;
rqstp->rq_res.tail[0].iov_len = 2<<2; default:
return 1; if (!svcxdr_encode_post_op_attr(rqstp, xdr, &resp->fh))
} else return 0;
return xdr_ressize_check(rqstp, p); }
return 1;
} }
static __be32 * static __be32 *
......
...@@ -176,6 +176,7 @@ struct nfsd3_readdirres { ...@@ -176,6 +176,7 @@ struct nfsd3_readdirres {
struct svc_fh scratch; struct svc_fh scratch;
int count; int count;
__be32 verf[2]; __be32 verf[2];
struct page **pages;
struct readdir_cd common; struct readdir_cd common;
__be32 * buffer; __be32 * buffer;
......
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