NFSv4: Convert LOCKU to use nfs4_async_handle_exception()

Convert CLOSE so that it specifies the correct stateid and
inode for the error handling.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index b704e08b390c4af2c0f43d03e0b65c94d3a38ba9..b927fda32e7408190e63999b461b1a2f72a45916 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6071,6 +6071,10 @@ static void nfs4_locku_release_calldata(void *data)
 static void nfs4_locku_done(struct rpc_task *task, void *data)
 {
        struct nfs4_unlockdata *calldata = data;
+       struct nfs4_exception exception = {
+               .inode = calldata->lsp->ls_state->inode,
+               .stateid = &calldata->arg.stateid,
+       };
 
        if (!nfs4_sequence_done(task, &calldata->res.seq_res))
                return;
@@ -6094,8 +6098,10 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
                                rpc_restart_call_prepare(task);
                        break;
                default:
-                       if (nfs4_async_handle_error(task, calldata->server,
-                                                   NULL, NULL) == -EAGAIN)
+                       task->tk_status = nfs4_async_handle_exception(task,
+                                       calldata->server, task->tk_status,
+                                       &exception);
+                       if (exception.retry)
                                rpc_restart_call_prepare(task);
        }
        nfs_release_seqid(calldata->arg.seqid);