]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
NFSv4: Fix a nograce recovery hang
authorBenjamin Coddington <bcodding@redhat.com>
Thu, 1 Oct 2015 13:17:33 +0000 (09:17 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 2 Oct 2015 19:43:07 +0000 (15:43 -0400)
Since commit 5cae02f42793130e1387f4ec09c4d07056ce9fa5 an OPEN_CONFIRM should
have a privileged sequence in the recovery case to allow nograce recovery to
proceed for NFSv4.0.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/nfs4proc.c

index 12e9808d5df0d8cb6df27e993cf32d44b5444f42..83d577085bd93a808c7f1433d3bdfd6a447c91e8 100644 (file)
@@ -1869,6 +1869,8 @@ static int _nfs4_proc_open_confirm(struct nfs4_opendata *data)
        data->rpc_done = 0;
        data->rpc_status = 0;
        data->timestamp = jiffies;
+       if (data->is_recover)
+               nfs4_set_sequence_privileged(&data->c_arg.seq_args);
        task = rpc_run_task(&task_setup_data);
        if (IS_ERR(task))
                return PTR_ERR(task);