NFSv4: nfs4_locku_done must release the sequence id

Trond Myklebust · Trond Myklebust · commit 2b1bc308f492 · 2012-10-31T15:10:04.000-04:00
If the state recovery machinery is triggered by the call to
nfs4_async_handle_error() then we can deadlock.

Signed-off-by: Trond Myklebust &lt;Trond.Myklebust@netapp.com&gt;
Cc: stable@vger.kernel.org
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
@@ -4531,6 +4531,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
 			if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN)
 				rpc_restart_call_prepare(task);
 	}
+	nfs_release_seqid(calldata->arg.seqid);
 }
 
 static void nfs4_locku_prepare(struct rpc_task *task, void *data)

Original file line number	Diff line number	Diff line change
`@@ -4531,6 +4531,7 @@ static void nfs4_locku_done(struct rpc_task task, void data)`
`4531`	`4531`	`if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN)`
`4532`	`4532`	`rpc_restart_call_prepare(task);`
`4533`	`4533`	`}`
	`4534`	`+ nfs_release_seqid(calldata->arg.seqid);`
`4534`	`4535`	`}`
`4535`	`4536`
`4536`	`4537`	`static void nfs4_locku_prepare(struct rpc_task task, void data)`