diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-03 20:28:59 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-03 20:42:23 -0500 |
| commit | 48d66b9749e39e0d4cc37d635df3f18906af38a6 (patch) | |
| tree | b64b126f4b74bae8b4fd3db8d26147a2d394477f /fs/nfs/nfs4state.c | |
| parent | ef070dcb3989f553f5d84edf555eebc7e204099d (diff) | |
| download | op-kernel-dev-48d66b9749e39e0d4cc37d635df3f18906af38a6.zip op-kernel-dev-48d66b9749e39e0d4cc37d635df3f18906af38a6.tar.gz | |
NFSv4: Fix a race in NFSv4.1 server trunking discovery
We do not want to allow a race with another NFS mount to cause
nfs41_walk_client_list() to establish a lease on our nfs_client before
we're done checking for trunking.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 5ad908e..d8b43f0 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -346,9 +346,19 @@ int nfs41_discover_server_trunking(struct nfs_client *clp, status = nfs4_proc_exchange_id(clp, cred); if (status != NFS4_OK) return status; - set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); - return nfs41_walk_client_list(clp, result, cred); + status = nfs41_walk_client_list(clp, result, cred); + if (status < 0) + return status; + if (clp != *result) + return 0; + + set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); + nfs4_schedule_state_manager(clp); + status = nfs_wait_client_init_complete(clp); + if (status < 0) + nfs_put_client(clp); + return status; } #endif /* CONFIG_NFS_V4_1 */ |
