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

xprtrdma: Remove the RPCRDMA_REQ_F_PENDING flag 



Commit 9590d083 ("xprtrdma: Use xprt_pin_rqst in
rpcrdma_reply_handler") pins incoming RPC/RDMA replies so they
can be left in the pending requests queue while they are being
processed without introducing a race between ->buf_free and the
transport's reply handler. Therefore RPCRDMA_REQ_F_PENDING is no
longer necessary.

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

net/sunrpc/xprtrdma/rpc_rdma.c

+0 −1
Original line number Diff line number Diff line
@@ -1371,7 +1371,6 @@ void rpcrdma_reply_handler(struct rpcrdma_rep *rep) 
	}

	req->rl_reply = rep;

	rep->rr_rqst = rqst;

	clear_bit(RPCRDMA_REQ_F_PENDING, &req->rl_flags);



	trace_xprtrdma_reply(rqst->rq_task, rep, req, credits);

	queue_work(buf->rb_completion_wq, &rep->rr_work);

net/sunrpc/xprtrdma/transport.c

+1 −3
Original line number Diff line number Diff line
@@ -618,7 +618,6 @@ xprt_rdma_free(struct rpc_task *task) 
	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(rqst->rq_xprt);

	struct rpcrdma_req *req = rpcr_to_rdmar(rqst);



	if (test_bit(RPCRDMA_REQ_F_PENDING, &req->rl_flags))

	rpcrdma_release_rqst(r_xprt, req);

	trace_xprtrdma_op_free(task, req);

}
@@ -667,7 +666,6 @@ xprt_rdma_send_request(struct rpc_rqst *rqst) 
		goto drop_connection;

	rqst->rq_xtime = ktime_get();



	__set_bit(RPCRDMA_REQ_F_PENDING, &req->rl_flags);

	if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req))

		goto drop_connection;

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −1
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ struct rpcrdma_req { 


/* rl_flags */

enum {

	RPCRDMA_REQ_F_PENDING = 0,

	RPCRDMA_REQ_F_TX_RESOURCES,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE