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

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

xprtrdma: Don't disable BH's in backchannel server 



Clean up: This code was copied from xprtsock.c and
backchannel_rqst.c. For rpcrdma, the backchannel server runs
exclusively in process context, thus disabling bottom-halves is
unnecessary.

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

net/sunrpc/xprtrdma/backchannel.c

+8 −8
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ static int rpcrdma_bc_setup_reqs(struct rpcrdma_xprt *r_xprt, 
		INIT_LIST_HEAD(&rqst->rq_list);

		INIT_LIST_HEAD(&rqst->rq_bc_list);

		__set_bit(RPC_BC_PA_IN_USE, &rqst->rq_bc_pa_state);

		spin_lock_bh(&xprt->bc_pa_lock);

		spin_lock(&xprt->bc_pa_lock);

		list_add(&rqst->rq_bc_pa_list, &xprt->bc_pa_list);

		spin_unlock_bh(&xprt->bc_pa_lock);

		spin_unlock(&xprt->bc_pa_lock);



		size = r_xprt->rx_data.inline_rsize;

		rb = rpcrdma_alloc_regbuf(size, DMA_TO_DEVICE, GFP_KERNEL);
@@ -228,16 +228,16 @@ void xprt_rdma_bc_destroy(struct rpc_xprt *xprt, unsigned int reqs) 
	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);

	struct rpc_rqst *rqst, *tmp;



	spin_lock_bh(&xprt->bc_pa_lock);

	spin_lock(&xprt->bc_pa_lock);

	list_for_each_entry_safe(rqst, tmp, &xprt->bc_pa_list, rq_bc_pa_list) {

		list_del(&rqst->rq_bc_pa_list);

		spin_unlock_bh(&xprt->bc_pa_lock);

		spin_unlock(&xprt->bc_pa_lock);



		rpcrdma_bc_free_rqst(r_xprt, rqst);



		spin_lock_bh(&xprt->bc_pa_lock);

		spin_lock(&xprt->bc_pa_lock);

	}

	spin_unlock_bh(&xprt->bc_pa_lock);

	spin_unlock(&xprt->bc_pa_lock);

}



/**
@@ -255,9 +255,9 @@ void xprt_rdma_bc_free_rqst(struct rpc_rqst *rqst) 
	rpcrdma_recv_buffer_put(req->rl_reply);

	req->rl_reply = NULL;



	spin_lock_bh(&xprt->bc_pa_lock);

	spin_lock(&xprt->bc_pa_lock);

	list_add_tail(&rqst->rq_bc_pa_list, &xprt->bc_pa_list);

	spin_unlock_bh(&xprt->bc_pa_lock);

	spin_unlock(&xprt->bc_pa_lock);

}



/**