Commit 983084b2 authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Remove svc_rqst::rq_xprt_hlen 



Clean up: This field is now always set to zero.

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

include/linux/sunrpc/svc.h

+0 −2
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ struct svc_rqst { 
	void *			rq_xprt_ctxt;	/* transport specific context ptr */

	struct svc_deferred_req*rq_deferred;	/* deferred request we are replaying */



	size_t			rq_xprt_hlen;	/* xprt header len */

	struct xdr_buf		rq_arg;

	struct xdr_stream	rq_arg_stream;

	struct xdr_stream	rq_res_stream;
@@ -397,7 +396,6 @@ struct svc_deferred_req { 
	size_t			daddrlen;

	void			*xprt_ctxt;

	struct cache_deferred_req handle;

	size_t			xprt_hlen;

	int			argslen;

	__be32			args[];

};

include/trace/events/sunrpc.h

+1 −2
Original line number Diff line number Diff line
@@ -2020,8 +2020,7 @@ DECLARE_EVENT_CLASS(svc_deferred_event, 


	TP_fast_assign(

		__entry->dr = dr;

		__entry->xid = be32_to_cpu(*(__be32 *)(dr->args +

						       (dr->xprt_hlen>>2)));

		__entry->xid = be32_to_cpu(*(__be32 *)dr->args);

		__assign_sockaddr(addr, &dr->addr, dr->addrlen);

	),

net/sunrpc/svc_xprt.c

+4 −6
Original line number Diff line number Diff line
@@ -1230,7 +1230,6 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req) 
		dr->addrlen = rqstp->rq_addrlen;

		dr->daddr = rqstp->rq_daddr;

		dr->argslen = rqstp->rq_arg.len >> 2;

		dr->xprt_hlen = rqstp->rq_xprt_hlen;

		dr->xprt_ctxt = rqstp->rq_xprt_ctxt;

		rqstp->rq_xprt_ctxt = NULL;
@@ -1258,9 +1257,9 @@ static noinline int svc_deferred_recv(struct svc_rqst *rqstp) 
	trace_svc_defer_recv(dr);



	/* setup iov_base past transport header */

	rqstp->rq_arg.head[0].iov_base = dr->args + (dr->xprt_hlen>>2);

	rqstp->rq_arg.head[0].iov_base = dr->args;

	/* The iov_len does not include the transport header bytes */

	rqstp->rq_arg.head[0].iov_len = (dr->argslen<<2) - dr->xprt_hlen;

	rqstp->rq_arg.head[0].iov_len = dr->argslen << 2;

	rqstp->rq_arg.page_len = 0;

	/* The rq_arg.len includes the transport header bytes */

	rqstp->rq_arg.len     = dr->argslen << 2;
@@ -1268,12 +1267,11 @@ static noinline int svc_deferred_recv(struct svc_rqst *rqstp) 
	memcpy(&rqstp->rq_addr, &dr->addr, dr->addrlen);

	rqstp->rq_addrlen     = dr->addrlen;

	/* Save off transport header len in case we get deferred again */

	rqstp->rq_xprt_hlen   = dr->xprt_hlen;

	rqstp->rq_daddr       = dr->daddr;

	rqstp->rq_respages    = rqstp->rq_pages;

	rqstp->rq_xprt_ctxt   = dr->xprt_ctxt;

	svc_xprt_received(rqstp->rq_xprt);

	return (dr->argslen<<2) - dr->xprt_hlen;

	return dr->argslen << 2;

}

net/sunrpc/svcsock.c

+0 −2
Original line number Diff line number Diff line
@@ -250,8 +250,6 @@ static ssize_t svc_tcp_read_msg(struct svc_rqst *rqstp, size_t buflen, 
	ssize_t len;

	size_t t;



	rqstp->rq_xprt_hlen = 0;



	clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);



	for (i = 0, t = 0; t < buflen; i++, t += PAGE_SIZE) {

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+0 −1
Original line number Diff line number Diff line
@@ -831,7 +831,6 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) 
		goto out_err;

	if (ret == 0)

		goto out_drop;

	rqstp->rq_xprt_hlen = 0;



	if (svc_rdma_is_reverse_direction_reply(xprt, ctxt))

		goto out_backchannel;