Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfsd4: don't remove rebooted client record until confirmation

Browse Source 
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>
This commit is contained in:
J. Bruce Fields 2012-05-29 14:44:28 -04:00
parent 32f16b3823
commit b9831b59f3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfsd/nfs4state.c
View File

@ -1614,7 +1614,8 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
status = nfserr_clid_inuse; status = nfserr_clid_inuse;
goto out; goto out;
} }
goto expire_client; expire_client(conf);
goto out_new;
} }
if (verfs_match) { /* case 2 */ if (verfs_match) { /* case 2 */
conf->cl_exchange_flags |= EXCHGID4_FLAG_CONFIRMED_R; conf->cl_exchange_flags |= EXCHGID4_FLAG_CONFIRMED_R;
@ -1622,8 +1623,6 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
goto out_copy; goto out_copy;
} }
/* case 5, client reboot */ /* case 5, client reboot */
expire_client:
expire_client(conf);
goto out_new; goto out_new;
} }
@ -1805,8 +1804,14 @@ nfsd4_create_session(struct svc_rqst *rqstp,
/* cache solo and embedded create sessions under the state lock */ /* cache solo and embedded create sessions under the state lock */
nfsd4_cache_create_session(cr_ses, cs_slot, status); 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); move_to_confirmed(conf);
}
out: out:
nfs4_unlock_state(); nfs4_unlock_state();
dprintk("%s returns %d\n", __func__, ntohl(status)); dprintk("%s returns %d\n", __func__, ntohl(status));