1 files changed, 8 insertions, 1 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index e97dd219f84f..5d744a52b4e1 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1643,7 +1643,14 @@ static void nfs4_state_manager(struct nfs_client *clp)
                                 goto out_error;
                         }
                         clear_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state);
-                        set_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state);
+
+                        if (test_and_clear_bit(NFS4CLNT_SERVER_SCOPE_MISMATCH,
+                                               &clp->cl_state))
+                                nfs4_state_start_reclaim_nograce(clp);
+                        else
+                                set_bit(NFS4CLNT_RECLAIM_REBOOT,
+                                        &clp->cl_state);
+
                         pnfs_destroy_all_layouts(clp);
                 }