Commit 03493bca authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Rename svc_encode_read_payload() 



Clean up: "result payload" is a less confusing name for these
payloads. "READ payload" reflects only the NFS usage.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent ab1394ee

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -3829,7 +3829,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, 
	read->rd_length = maxcount;

	if (nfserr)

		return nfserr;

	if (svc_encode_read_payload(resp->rqstp, starting_len + 8, maxcount))

	if (svc_encode_result_payload(resp->rqstp, starting_len + 8, maxcount))

		return nfserr_io;

	xdr_truncate_encode(xdr, starting_len + 8 + xdr_align_size(maxcount));

include/linux/sunrpc/svc.h

+3 −3
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ void svc_wake_up(struct svc_serv *); 
void		   svc_reserve(struct svc_rqst *rqstp, int space);

struct svc_pool *  svc_pool_for_cpu(struct svc_serv *serv, int cpu);

char *		   svc_print_addr(struct svc_rqst *, char *, size_t);

int		   svc_encode_read_payload(struct svc_rqst *rqstp,

int		   svc_encode_result_payload(struct svc_rqst *rqstp,

					     unsigned int offset,

					     unsigned int length);

unsigned int	   svc_fill_write_vector(struct svc_rqst *rqstp,

include/linux/sunrpc/svc_rdma.h

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ extern void svc_rdma_send_error_msg(struct svcxprt_rdma *rdma, 
				    struct svc_rdma_recv_ctxt *rctxt,

				    int status);

extern int svc_rdma_sendto(struct svc_rqst *);

extern int svc_rdma_read_payload(struct svc_rqst *rqstp, unsigned int offset,

extern int svc_rdma_result_payload(struct svc_rqst *rqstp, unsigned int offset,

				   unsigned int length);



/* svc_rdma_transport.c */

include/linux/sunrpc/svc_xprt.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct svc_xprt_ops { 
	int		(*xpo_has_wspace)(struct svc_xprt *);

	int		(*xpo_recvfrom)(struct svc_rqst *);

	int		(*xpo_sendto)(struct svc_rqst *);

	int		(*xpo_read_payload)(struct svc_rqst *, unsigned int,

	int		(*xpo_result_payload)(struct svc_rqst *, unsigned int,

					      unsigned int);

	void		(*xpo_release_rqst)(struct svc_rqst *);

	void		(*xpo_detach)(struct svc_xprt *);

net/sunrpc/svc.c

+6 −5
Original line number Diff line number Diff line
@@ -1622,7 +1622,7 @@ u32 svc_max_payload(const struct svc_rqst *rqstp) 
EXPORT_SYMBOL_GPL(svc_max_payload);



/**

 * svc_encode_read_payload - mark a range of bytes as a READ payload

 * svc_encode_result_payload - mark a range of bytes as a result payload

 * @rqstp: svc_rqst to operate on

 * @offset: payload's byte offset in rqstp->rq_res

 * @length: size of payload, in bytes
@@ -1630,12 +1630,13 @@ EXPORT_SYMBOL_GPL(svc_max_payload); 
 * Returns zero on success, or a negative errno if a permanent

 * error occurred.

 */

int svc_encode_read_payload(struct svc_rqst *rqstp, unsigned int offset,

int svc_encode_result_payload(struct svc_rqst *rqstp, unsigned int offset,

			      unsigned int length)

{

	return rqstp->rq_xprt->xpt_ops->xpo_read_payload(rqstp, offset, length);

	return rqstp->rq_xprt->xpt_ops->xpo_result_payload(rqstp, offset,

							   length);

}

EXPORT_SYMBOL_GPL(svc_encode_read_payload);

EXPORT_SYMBOL_GPL(svc_encode_result_payload);



/**

 * svc_fill_write_vector - Construct data argument for VFS write call