Commit 5fe46e9d authored by Bian Naimeng's avatar Bian Naimeng Committed by Trond Myklebust

rpc client can not deal with ENOSOCK, so translate it into ENOCONN

If NFSv4 client send a request before connect, or the old connection was broken
because a ETIMEOUT error catched by call_status, ->send_request will return
ENOSOCK, but rpc layer can not deal with it, so make sure ->send_request can
translate ENOSOCK into ENOCONN.
Signed-off-by: default avatarBian Naimeng <biannm@cn.fujitsu.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 25cf84cf
...@@ -549,8 +549,6 @@ static int xs_udp_send_request(struct rpc_task *task) ...@@ -549,8 +549,6 @@ static int xs_udp_send_request(struct rpc_task *task)
/* Still some bytes left; set up for a retry later. */ /* Still some bytes left; set up for a retry later. */
status = -EAGAIN; status = -EAGAIN;
} }
if (!transport->sock)
goto out;
switch (status) { switch (status) {
case -ENOTSOCK: case -ENOTSOCK:
...@@ -570,7 +568,7 @@ static int xs_udp_send_request(struct rpc_task *task) ...@@ -570,7 +568,7 @@ static int xs_udp_send_request(struct rpc_task *task)
* prompts ECONNREFUSED. */ * prompts ECONNREFUSED. */
clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags); clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags);
} }
out:
return status; return status;
} }
...@@ -652,8 +650,6 @@ static int xs_tcp_send_request(struct rpc_task *task) ...@@ -652,8 +650,6 @@ static int xs_tcp_send_request(struct rpc_task *task)
status = -EAGAIN; status = -EAGAIN;
break; break;
} }
if (!transport->sock)
goto out;
switch (status) { switch (status) {
case -ENOTSOCK: case -ENOTSOCK:
...@@ -673,7 +669,7 @@ static int xs_tcp_send_request(struct rpc_task *task) ...@@ -673,7 +669,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
case -ENOTCONN: case -ENOTCONN:
clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags); clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags);
} }
out:
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment