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

Commit f02877ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared
parents 3c512b19 24ca9a84

net/sunrpc/xprtsock.c

+1 −2
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int xs_nospace(struct rpc_task *task) 
	struct rpc_rqst *req = task->tk_rqstp;

	struct rpc_xprt *xprt = req->rq_xprt;

	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);

	int ret = 0;

	int ret = -EAGAIN;



	dprintk("RPC: %5u xmit incomplete (%u left of %u)\n",

			task->tk_pid, req->rq_slen - req->rq_bytes_sent,
@@ -508,7 +508,6 @@ static int xs_nospace(struct rpc_task *task) 
	/* Don't race with disconnect */

	if (xprt_connected(xprt)) {

		if (test_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags)) {

			ret = -EAGAIN;

			/*

			 * Notify TCP that we're limited by the application

			 * window size