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

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

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

fs/lockd/clntproc.c

+7 −1
Original line number Diff line number Diff line
@@ -708,8 +708,14 @@ static void nlmclnt_unlock_callback(struct rpc_task *task, void *data) 


	if (task->tk_status < 0) {

		dprintk("lockd: unlock failed (err = %d)\n", -task->tk_status);

		switch (task->tk_status) {

		case -EACCES:

		case -EIO:

			goto die;

		default:

			goto retry_rebind;

		}

	}

	if (status == NLM_LCK_DENIED_GRACE_PERIOD) {

		rpc_delay(task, NLMCLNT_GRACE_WAIT);

		goto retry_unlock;

include/linux/sunrpc/sched.h

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ struct rpc_task { 
#endif

	unsigned char		tk_priority : 2,/* Task priority */

				tk_garb_retry : 2,

				tk_cred_retry : 2;

				tk_cred_retry : 2,

				tk_rebind_retry : 2;

};

#define tk_xprt			tk_client->cl_xprt

net/sunrpc/clnt.c

+3 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,9 @@ call_bind_status(struct rpc_task *task) 
			status = -EOPNOTSUPP;

			break;

		}

		if (task->tk_rebind_retry == 0)

			break;

		task->tk_rebind_retry--;

		rpc_delay(task, 3*HZ);

		goto retry_timeout;

	case -ETIMEDOUT:

net/sunrpc/sched.c

+1 −0
Original line number Diff line number Diff line
@@ -792,6 +792,7 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta 
	/* Initialize retry counters */

	task->tk_garb_retry = 2;

	task->tk_cred_retry = 2;

	task->tk_rebind_retry = 2;



	task->tk_priority = task_setup_data->priority - RPC_PRIORITY_LOW;

	task->tk_owner = current->tgid;