evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSv4: Fix a race in NFSv4.1 server trunking discovery

Browse source 
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>
This commit is contained in:
Trond Myklebust 2015-03-03 20:28:59 -05:00
parent ef070dcb39
commit 48d66b9749
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/nfs/client.c
View file

@ -433,7 +433,7 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
static bool nfs_client_init_is_complete(const struct nfs_client *clp) static bool nfs_client_init_is_complete(const struct nfs_client *clp)
{ {
return clp->cl_cons_state != NFS_CS_INITING; return clp->cl_cons_state <= NFS_CS_READY;
} }
int nfs_wait_client_init_complete(const struct nfs_client *clp) int nfs_wait_client_init_complete(const struct nfs_client *clp)

9
fs/nfs/nfs4client.c
View file

@ -621,6 +621,9 @@ int nfs41_walk_client_list(struct nfs_client *new,
spin_lock(&nn->nfs_client_lock); spin_lock(&nn->nfs_client_lock);
list_for_each_entry(pos, &nn->nfs_client_list, cl_share_link) { list_for_each_entry(pos, &nn->nfs_client_list, cl_share_link) {
if (pos == new)
goto found;
if (pos->rpc_ops != new->rpc_ops) if (pos->rpc_ops != new->rpc_ops)
continue; continue;
@ -639,10 +642,6 @@ int nfs41_walk_client_list(struct nfs_client *new,
prev = pos; prev = pos;
status = nfs_wait_client_init_complete(pos); status = nfs_wait_client_init_complete(pos);
if (pos->cl_cons_state == NFS_CS_SESSION_INITING) {
nfs4_schedule_lease_recovery(pos);
status = nfs4_wait_clnt_recover(pos);
}
spin_lock(&nn->nfs_client_lock); spin_lock(&nn->nfs_client_lock);
if (status < 0) if (status < 0)
break; break;
@ -668,7 +667,7 @@ int nfs41_walk_client_list(struct nfs_client *new,
*/ */
if (!nfs4_match_client_owner_id(pos, new)) if (!nfs4_match_client_owner_id(pos, new))
continue; continue;
found:
atomic_inc(&pos->cl_count); atomic_inc(&pos->cl_count);
*result = pos; *result = pos;
status = 0; status = 0;

14
fs/nfs/nfs4state.c
View file

@ -346,9 +346,19 @@ int nfs41_discover_server_trunking(struct nfs_client *clp,
status = nfs4_proc_exchange_id(clp, cred); status = nfs4_proc_exchange_id(clp, cred);
if (status != NFS4_OK) if (status != NFS4_OK)
return status; 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 */ #endif /* CONFIG_NFS_V4_1 */