Merge tag 'nfs-for-4.13-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[mirror_ubuntu-artful-kernel.git] / fs / nfs / nfs4state.c

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index cbf82b0d446759a4934fbf7329e6a767ad5530ce..0378e2257ca75f392f20bebe59ca935951d7a813 100644 (file)
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -352,11 +352,17 @@ int nfs41_discover_server_trunking(struct nfs_client *clp,
        if (clp != *result)
                return 0;
 
-       /* Purge state if the client id was established in a prior instance */
-       if (clp->cl_exchange_flags & EXCHGID4_FLAG_CONFIRMED_R)
-               set_bit(NFS4CLNT_PURGE_STATE, &clp->cl_state);
-       else
-               set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);
+       /*
+        * Purge state if the client id was established in a prior
+        * instance and the client id could not have arrived on the
+        * server via Transparent State Migration.
+        */
+       if (clp->cl_exchange_flags & EXCHGID4_FLAG_CONFIRMED_R) {
+               if (!test_bit(NFS_CS_TSM_POSSIBLE, &clp->cl_flags))
+                       set_bit(NFS4CLNT_PURGE_STATE, &clp->cl_state);
+               else
+                       set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);
+       }
        nfs4_schedule_state_manager(clp);
        status = nfs_wait_client_init_complete(clp);
        if (status < 0)