diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-05-29 14:44:28 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-05-31 20:30:34 -0400 |
| commit | b9831b59f31eca65e1beec01fadf02ca82485813 (patch) | |
| tree | b3fb99210c6033f55dd8112549322d54c3d3bcc6 /fs/nfsd | |
| parent | 32f16b3823b854a1f73bfad43782fbbcfe086090 (diff) | |
| download | linux-3.10-b9831b59f31eca65e1beec01fadf02ca82485813.tar.gz linux-3.10-b9831b59f31eca65e1beec01fadf02ca82485813.tar.bz2 linux-3.10-b9831b59f31eca65e1beec01fadf02ca82485813.zip | |
nfsd4: don't remove rebooted client record until confirmation
In the NFSv4.1 client-reboot case we're currently removing the client's
previous state in exchange_id. That's wrong--we should be waiting till
the confirming create_session.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 8d10760800a..c91e26d84f0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1614,7 +1614,8 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, status = nfserr_clid_inuse; goto out; } - goto expire_client; + expire_client(conf); + goto out_new; } if (verfs_match) { /* case 2 */ conf->cl_exchange_flags |= EXCHGID4_FLAG_CONFIRMED_R; @@ -1622,8 +1623,6 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, goto out_copy; } /* case 5, client reboot */ -expire_client: - expire_client(conf); goto out_new; } @@ -1805,8 +1804,14 @@ nfsd4_create_session(struct svc_rqst *rqstp, /* cache solo and embedded create sessions under the state lock */ nfsd4_cache_create_session(cr_ses, cs_slot, status); - if (confirm_me) + if (confirm_me) { + unsigned int hash = clientstr_hashval(unconf->cl_recdir); + struct nfs4_client *old = + find_confirmed_client_by_str(conf->cl_recdir, hash); + if (old) + expire_client(old); move_to_confirmed(conf); + } out: nfs4_unlock_state(); dprintk("%s returns %d\n", __func__, ntohl(status)); |