Commit 8d43417e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chuck Lever
Browse files

sunrpc: simplify xdr_init_encode_pages 



The rqst argument to xdr_init_encode_pages is set to NULL by all callers,
and pages is always set to buf->pages.  Remove the two arguments and
hardcode the assignments.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 3b8737ce

fs/nfsd/nfs3proc.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void nfsd3_init_dirlist_pages(struct svc_rqst *rqstp, 
	buf->pages = rqstp->rq_next_page;

	rqstp->rq_next_page += (buf->buflen + PAGE_SIZE - 1) >> PAGE_SHIFT;



	xdr_init_encode_pages(xdr, buf, buf->pages,  NULL);

	xdr_init_encode_pages(xdr, buf);

}



/*

fs/nfsd/nfsproc.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static void nfsd_init_dirlist_pages(struct svc_rqst *rqstp, 
	buf->pages = rqstp->rq_next_page;

	rqstp->rq_next_page++;



	xdr_init_encode_pages(xdr, buf, buf->pages,  NULL);

	xdr_init_encode_pages(xdr, buf);

}



/*

include/linux/sunrpc/xdr.h

+1 −2
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ typedef int (*kxdrdproc_t)(struct rpc_rqst *rqstp, struct xdr_stream *xdr, 


extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf,

			    __be32 *p, struct rpc_rqst *rqst);

extern void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf,

			   struct page **pages, struct rpc_rqst *rqst);

void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf);

extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);

extern int xdr_reserve_space_vec(struct xdr_stream *xdr, size_t nbytes);

extern void __xdr_commit_encode(struct xdr_stream *xdr);

net/sunrpc/xdr.c

+4 −7
Original line number Diff line number Diff line
@@ -993,21 +993,18 @@ EXPORT_SYMBOL_GPL(xdr_init_encode); 
 * xdr_init_encode_pages - Initialize an xdr_stream for encoding into pages

 * @xdr: pointer to xdr_stream struct

 * @buf: pointer to XDR buffer into which to encode data

 * @pages: list of pages to decode into

 * @rqst: pointer to controlling rpc_rqst, for debugging

 *

 */

void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf,

			   struct page **pages, struct rpc_rqst *rqst)

void xdr_init_encode_pages(struct xdr_stream *xdr, struct xdr_buf *buf)

{

	xdr_reset_scratch_buffer(xdr);



	xdr->buf = buf;

	xdr->page_ptr = pages;

	xdr->page_ptr = buf->pages;

	xdr->iov = NULL;

	xdr->p = page_address(*pages);

	xdr->p = page_address(*xdr->page_ptr);

	xdr->end = (void *)xdr->p + min_t(u32, buf->buflen, PAGE_SIZE);

	xdr->rqst = rqst;

	xdr->rqst = NULL;

}

EXPORT_SYMBOL_GPL(xdr_init_encode_pages);