NFSv4: Convert DELEGRETURN to use nfs4_handle_exception()

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ea2b7e8db437c5a4e370106bc72183c0c99f6d41..b704e08b390c4af2c0f43d03e0b65c94d3a38ba9 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5764,6 +5764,10 @@ struct nfs4_delegreturndata {
 static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
 {
        struct nfs4_delegreturndata *data = calldata;
+       struct nfs4_exception exception = {
+               .inode = data->inode,
+               .stateid = &data->stateid,
+       };
 
        if (!nfs4_sequence_done(task, &data->res.seq_res))
                return;
@@ -5825,10 +5829,11 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
                }
                /* Fallthrough */
        default:
-               if (nfs4_async_handle_error(task, data->res.server,
-                                           NULL, NULL) == -EAGAIN) {
+               task->tk_status = nfs4_async_handle_exception(task,
+                               data->res.server, task->tk_status,
+                               &exception);
+               if (exception.retry)
                        goto out_restart;
-               }
        }
        data->rpc_status = task->tk_status;
        return;