diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-03 20:35:31 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-03 21:52:30 -0500 |
| commit | e11259f920d8cb3550e0f311c064bdabe1bc3aaf (patch) | |
| tree | 2b07c087911fe9c2db2f38943af888c693efe163 /fs/nfs/nfs4state.c | |
| parent | 48d66b9749e39e0d4cc37d635df3f18906af38a6 (diff) | |
| download | linux-stable-e11259f920d8cb3550e0f311c064bdabe1bc3aaf.tar.gz linux-stable-e11259f920d8cb3550e0f311c064bdabe1bc3aaf.tar.bz2 linux-stable-e11259f920d8cb3550e0f311c064bdabe1bc3aaf.zip | |
NFSv4.1: Clear the old state by our client id before establishing a new lease
If the call to exchange-id returns with the EXCHGID4_FLAG_CONFIRMED_R flag
set, then that means our lease was established by a previous mount instance.
Ensure that we detect this situation, and that we clear the state held by
that mount.
Reported-by: Jorge Mora <Jorge.Mora@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index d8b43f0e08fc..f95e3b58bbc3 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -353,7 +353,11 @@ int nfs41_discover_server_trunking(struct nfs_client *clp, if (clp != *result) return 0; - set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); + /* 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); nfs4_schedule_state_manager(clp); status = nfs_wait_client_init_complete(clp); if (status < 0) |