Browse Source

SUNRPC: Handle connection issues correctly on the back channel

If the back channel is disconnected, we can and should just fail the
transmission. The expectation is that the NFSv4.1 server will always
retransmit any outstanding callbacks once the connection is
re-established.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Trond Myklebust 10 years ago
parent
commit
3832591e6f
1 changed files with 7 additions and 1 deletions
  1. 7 1
      net/sunrpc/clnt.c

+ 7 - 1
net/sunrpc/clnt.c

@@ -1031,6 +1031,7 @@ struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req)
 	struct xdr_buf *xbufp = &req->rq_snd_buf;
 	struct xdr_buf *xbufp = &req->rq_snd_buf;
 	struct rpc_task_setup task_setup_data = {
 	struct rpc_task_setup task_setup_data = {
 		.callback_ops = &rpc_default_ops,
 		.callback_ops = &rpc_default_ops,
+		.flags = RPC_TASK_SOFTCONN,
 	};
 	};
 
 
 	dprintk("RPC: rpc_run_bc_task req= %p\n", req);
 	dprintk("RPC: rpc_run_bc_task req= %p\n", req);
@@ -1964,10 +1965,15 @@ call_bc_transmit(struct rpc_task *task)
 	switch (task->tk_status) {
 	switch (task->tk_status) {
 	case 0:
 	case 0:
 		/* Success */
 		/* Success */
-		break;
 	case -EHOSTDOWN:
 	case -EHOSTDOWN:
 	case -EHOSTUNREACH:
 	case -EHOSTUNREACH:
 	case -ENETUNREACH:
 	case -ENETUNREACH:
+	case -ECONNRESET:
+	case -ECONNREFUSED:
+	case -EADDRINUSE:
+	case -ENOTCONN:
+	case -EPIPE:
+		break;
 	case -ETIMEDOUT:
 	case -ETIMEDOUT:
 		/*
 		/*
 		 * Problem reaching the server.  Disconnect and let the
 		 * Problem reaching the server.  Disconnect and let the