Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2a67190 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Remove rpcrdma_rep::rr_len 



This field is no longer used outside the Receive completion handler.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent fdf503e3

net/sunrpc/xprtrdma/rpc_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1178,7 +1178,7 @@ rpcrdma_reply_handler(struct work_struct *work) 


	dprintk("RPC:       %s: incoming rep %p\n", __func__, rep);



	if (rep->rr_len == RPCRDMA_BAD_LEN)

	if (rep->rr_hdrbuf.head[0].iov_len == 0)

		goto out_badstatus;



	xdr_init_decode(xdr, &rep->rr_hdrbuf,

net/sunrpc/xprtrdma/verbs.c

+4 −7
Original line number Diff line number Diff line
@@ -143,9 +143,6 @@ rpcrdma_update_granted_credits(struct rpcrdma_rep *rep) 
	struct rpcrdma_buffer *buffer = &rep->rr_rxprt->rx_buf;

	u32 credits;



	if (rep->rr_len < RPCRDMA_HDRLEN_ERR)

		return;



	credits = be32_to_cpu(rmsgp->rm_credit);

	if (credits == 0)

		credits = 1;	/* don't deadlock */
@@ -176,15 +173,15 @@ rpcrdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc) 
	dprintk("RPC:       %s: rep %p opcode 'recv', length %u: success\n",

		__func__, rep, wc->byte_len);



	rep->rr_len = wc->byte_len;

	rpcrdma_set_xdrlen(&rep->rr_hdrbuf, wc->byte_len);

	rep->rr_wc_flags = wc->wc_flags;

	rep->rr_inv_rkey = wc->ex.invalidate_rkey;



	ib_dma_sync_single_for_cpu(rdmab_device(rep->rr_rdmabuf),

				   rdmab_addr(rep->rr_rdmabuf),

				   rep->rr_len, DMA_FROM_DEVICE);

				   wc->byte_len, DMA_FROM_DEVICE);



	if (wc->byte_len >= RPCRDMA_HDRLEN_ERR)

		rpcrdma_update_granted_credits(rep);



out_schedule:
@@ -196,7 +193,7 @@ rpcrdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc) 
		pr_err("rpcrdma: Recv: %s (%u/0x%x)\n",

		       ib_wc_status_msg(wc->status),

		       wc->status, wc->vendor_err);

	rep->rr_len = RPCRDMA_BAD_LEN;

	rpcrdma_set_xdrlen(&rep->rr_hdrbuf, 0);

	goto out_schedule;

}

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −3
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ enum { 


struct rpcrdma_rep {

	struct ib_cqe		rr_cqe;

	unsigned int		rr_len;

	int			rr_wc_flags;

	u32			rr_inv_rkey;

	struct rpcrdma_xprt	*rr_rxprt;
@@ -230,8 +229,6 @@ struct rpcrdma_rep { 
	struct rpcrdma_regbuf	*rr_rdmabuf;

};



#define RPCRDMA_BAD_LEN		(~0U)



/*

 * struct rpcrdma_mw - external memory region metadata

 *