diff options
author | NeilBrown <neilb@suse.com> | 2017-08-18 17:12:51 +1000 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-08-20 12:39:28 -0400 |
commit | fd01b2597941d9c17980222999b0721648b383b8 (patch) | |
tree | 8b557a85fb38917bde44706cfe3b4b8b444625e6 | |
parent | 3bde7afdabe9f37974af806abe646c2ca43c67c7 (diff) | |
download | linux-fd01b2597941d9c17980222999b0721648b383b8.tar.gz linux-fd01b2597941d9c17980222999b0721648b383b8.tar.bz2 linux-fd01b2597941d9c17980222999b0721648b383b8.zip |
SUNRPC: ECONNREFUSED should cause a rebind.
If you
- mount and NFSv3 filesystem
- do some file locking which requires the server
to make a GRANT call back
- unmount
- mount again and do the same locking
then the second attempt at locking suffers a 30 second delay.
Unmounting and remounting causes lockd to stop and restart,
which causes it to bind to a new port.
The server still thinks the old port is valid and gets ECONNREFUSED
when trying to contact it.
ECONNREFUSED should be seen as a hard error that is not worth
retrying. Rebinding is the only reasonable response.
This patch forces a rebind if that makes sense.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | net/sunrpc/clnt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 2e49d1f892b7..69a9e5953744 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1903,6 +1903,14 @@ call_connect_status(struct rpc_task *task) task->tk_status = 0; switch (status) { case -ECONNREFUSED: + /* A positive refusal suggests a rebind is needed. */ + if (RPC_IS_SOFTCONN(task)) + break; + if (clnt->cl_autobind) { + rpc_force_rebind(clnt); + task->tk_action = call_bind; + return; + } case -ECONNRESET: case -ECONNABORTED: case -ENETUNREACH: |