NFSv4: Convert CLOSE to use nfs4_async_handle_exception()

Convert CLOSE so that it specifies the correct stateid, state 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 56fa5a16e0978e73d898b4f32cd4db44b9c18221..ea2b7e8db437c5a4e370106bc72183c0c99f6d41 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3148,6 +3148,11 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
        struct nfs4_state *state = calldata->state;
        struct nfs_server *server = NFS_SERVER(calldata->inode);
        nfs4_stateid *res_stateid = NULL;
+       struct nfs4_exception exception = {
+               .state = state,
+               .inode = calldata->inode,
+               .stateid = &calldata->arg.stateid,
+       };
 
        dprintk("%s: begin!\n", __func__);
        if (!nfs4_sequence_done(task, &calldata->res.seq_res))
@@ -3213,7 +3218,9 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
                case -NFS4ERR_BAD_STATEID:
                        break;
                default:
-                       if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN)
+                       task->tk_status = nfs4_async_handle_exception(task,
+                                       server, task->tk_status, &exception);
+                       if (exception.retry)
                                goto out_restart;
        }
        nfs_clear_open_stateid(state, &calldata->arg.stateid,