NFSv4: Fix another reboot recovery race

If the open_context for the file is not yet fully initialised,
then open recovery cannot succeed, and since nfs4_state_find_open_context
returns an ENOENT, we end up treating the file as being irrecoverable.

What we really want to do, is just defer the recovery until later.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 3e7d42fb775c..81343944e096 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1373,7 +1373,7 @@ static int nfs4_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state *sta
 
         ctx = nfs4_state_find_open_context(state);
         if (IS_ERR(ctx))
-                return PTR_ERR(ctx);
+                return -EAGAIN;
         ret = nfs4_do_open_reclaim(ctx, state);
         put_nfs_open_context(ctx);
         return ret;
@@ -1814,7 +1814,7 @@ static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *sta
 
         ctx = nfs4_state_find_open_context(state);
         if (IS_ERR(ctx))
-                return PTR_ERR(ctx);
+                return -EAGAIN;
         ret = nfs4_do_open_expired(ctx, state);
         put_nfs_open_context(ctx);
         return ret;
@@ -1936,10 +1936,8 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
         if (ret != 0)
                 goto out;
 
-        if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq)) {
+        if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
                 nfs4_schedule_stateid_recovery(server, state);
-                nfs4_wait_clnt_recover(server->nfs_client);
-        }
         *res = state;
 out:
         return ret;