Commit 0b760113 authored by Trond Myklebust's avatar Trond Myklebust

NLM: Don't hang forever on NLM unlock requests

If the NLM daemon is killed on the NFS server, we can currently end up
hanging forever on an 'unlock' request, instead of aborting. Basically,
if the rpcbind request fails, or the server keeps returning garbage, we
really want to quit instead of retrying.
Tested-by: default avatarVasily Averin <vvs@sw.ru>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
parent 9e3bd4e2
...@@ -708,7 +708,13 @@ static void nlmclnt_unlock_callback(struct rpc_task *task, void *data) ...@@ -708,7 +708,13 @@ static void nlmclnt_unlock_callback(struct rpc_task *task, void *data)
if (task->tk_status < 0) { if (task->tk_status < 0) {
dprintk("lockd: unlock failed (err = %d)\n", -task->tk_status); dprintk("lockd: unlock failed (err = %d)\n", -task->tk_status);
goto retry_rebind; switch (task->tk_status) {
case -EACCES:
case -EIO:
goto die;
default:
goto retry_rebind;
}
} }
if (status == NLM_LCK_DENIED_GRACE_PERIOD) { if (status == NLM_LCK_DENIED_GRACE_PERIOD) {
rpc_delay(task, NLMCLNT_GRACE_WAIT); rpc_delay(task, NLMCLNT_GRACE_WAIT);
......
...@@ -84,7 +84,8 @@ struct rpc_task { ...@@ -84,7 +84,8 @@ struct rpc_task {
#endif #endif
unsigned char tk_priority : 2,/* Task priority */ unsigned char tk_priority : 2,/* Task priority */
tk_garb_retry : 2, tk_garb_retry : 2,
tk_cred_retry : 2; tk_cred_retry : 2,
tk_rebind_retry : 2;
}; };
#define tk_xprt tk_client->cl_xprt #define tk_xprt tk_client->cl_xprt
......
...@@ -1175,6 +1175,9 @@ call_bind_status(struct rpc_task *task) ...@@ -1175,6 +1175,9 @@ call_bind_status(struct rpc_task *task)
status = -EOPNOTSUPP; status = -EOPNOTSUPP;
break; break;
} }
if (task->tk_rebind_retry == 0)
break;
task->tk_rebind_retry--;
rpc_delay(task, 3*HZ); rpc_delay(task, 3*HZ);
goto retry_timeout; goto retry_timeout;
case -ETIMEDOUT: case -ETIMEDOUT:
......
...@@ -792,6 +792,7 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta ...@@ -792,6 +792,7 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta
/* Initialize retry counters */ /* Initialize retry counters */
task->tk_garb_retry = 2; task->tk_garb_retry = 2;
task->tk_cred_retry = 2; task->tk_cred_retry = 2;
task->tk_rebind_retry = 2;
task->tk_priority = task_setup_data->priority - RPC_PRIORITY_LOW; task->tk_priority = task_setup_data->priority - RPC_PRIORITY_LOW;
task->tk_owner = current->tgid; task->tk_owner = current->tgid;
......
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