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

Commit 90051ea7 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Clean up - convert xprt_prepare_transmit to return a bool 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ee071eff

include/linux/sunrpc/xprt.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -288,7 +288,7 @@ int xprt_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task); 
int			xprt_reserve_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);

int			xprt_reserve_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);

void			xprt_alloc_slot(struct rpc_xprt *xprt, struct rpc_task *task);

void			xprt_alloc_slot(struct rpc_xprt *xprt, struct rpc_task *task);

void			xprt_lock_and_alloc_slot(struct rpc_xprt *xprt, struct rpc_task *task);

void			xprt_lock_and_alloc_slot(struct rpc_xprt *xprt, struct rpc_task *task);

int			xprt_prepare_transmit(struct rpc_task *task);

bool			xprt_prepare_transmit(struct rpc_task *task);

void			xprt_transmit(struct rpc_task *task);

void			xprt_transmit(struct rpc_task *task);

void			xprt_end_transmit(struct rpc_task *task);

void			xprt_end_transmit(struct rpc_task *task);

int			xprt_adjust_timeout(struct rpc_rqst *req);

int			xprt_adjust_timeout(struct rpc_rqst *req);

net/sunrpc/clnt.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1722,8 +1722,7 @@ call_transmit(struct rpc_task *task) 
	task->tk_action = call_status;

	task->tk_action = call_status;

	if (task->tk_status < 0)

	if (task->tk_status < 0)

		return;

		return;

	task->tk_status = xprt_prepare_transmit(task);

	if (!xprt_prepare_transmit(task))

	if (task->tk_status != 0)

		return;

		return;

	task->tk_action = call_transmit_status;

	task->tk_action = call_transmit_status;

	/* Encode here so that rpcsec_gss can use correct sequence number. */

	/* Encode here so that rpcsec_gss can use correct sequence number. */
@@ -1811,8 +1810,7 @@ call_bc_transmit(struct rpc_task *task) 
{

{

	struct rpc_rqst *req = task->tk_rqstp;

	struct rpc_rqst *req = task->tk_rqstp;





	task->tk_status = xprt_prepare_transmit(task);

	if (!xprt_prepare_transmit(task)) {

	if (task->tk_status == -EAGAIN) {

		/*

		/*

		 * Could not reserve the transport. Try again after the

		 * Could not reserve the transport. Try again after the

		 * transport is released.

		 * transport is released.

net/sunrpc/xprt.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -864,24 +864,27 @@ static inline int xprt_has_timer(struct rpc_xprt *xprt) 
 * @task: RPC task about to send a request

 * @task: RPC task about to send a request

 *

 *

 */

 */

int xprt_prepare_transmit(struct rpc_task *task)

bool xprt_prepare_transmit(struct rpc_task *task)

{

{

	struct rpc_rqst	*req = task->tk_rqstp;

	struct rpc_rqst	*req = task->tk_rqstp;

	struct rpc_xprt	*xprt = req->rq_xprt;

	struct rpc_xprt	*xprt = req->rq_xprt;

	int err = 0;

	bool ret = false;





	dprintk("RPC: %5u xprt_prepare_transmit\n", task->tk_pid);

	dprintk("RPC: %5u xprt_prepare_transmit\n", task->tk_pid);





	spin_lock_bh(&xprt->transport_lock);

	spin_lock_bh(&xprt->transport_lock);

	if (req->rq_reply_bytes_recvd && !req->rq_bytes_sent) {

	if (req->rq_reply_bytes_recvd && !req->rq_bytes_sent) {

		err = req->rq_reply_bytes_recvd;

		task->tk_status = req->rq_reply_bytes_recvd;

		goto out_unlock;

	}

	if (!xprt->ops->reserve_xprt(xprt, task)) {

		task->tk_status = -EAGAIN;

		goto out_unlock;

		goto out_unlock;

	}

	}

	if (!xprt->ops->reserve_xprt(xprt, task))

	ret = true;

		err = -EAGAIN;

out_unlock:

out_unlock:

	spin_unlock_bh(&xprt->transport_lock);

	spin_unlock_bh(&xprt->transport_lock);

	return err;

	return ret;

}

}





void xprt_end_transmit(struct rpc_task *task)

void xprt_end_transmit(struct rpc_task *task)