iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd41: renew_client must be called under the state lock

Browse Source 
Until we work out the state locking so we can use a spin lock to protect
the cl_lru, we need to take the state_lock to renew the client.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
[nfsd41: Do not renew state on error]
Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
[nfsd41: Simplify exit code]
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Benny Halevy 2009-08-20 03:21:56 +03:00 committed by J. Bruce Fields
parent eac81736e6
commit aaf84eb95a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfsd/nfs4state.c
View File

@ -1481,7 +1481,7 @@ nfsd4_sequence(struct svc_rqst *rqstp,
* for nfsd4_svc_encode_compoundres processing */ * for nfsd4_svc_encode_compoundres processing */
status = nfsd4_replay_cache_entry(resp, seq); status = nfsd4_replay_cache_entry(resp, seq);
cstate->status = nfserr_replay_cache; cstate->status = nfserr_replay_cache;
goto replay_cache; goto out;
} }
if (status) if (status)
goto out; goto out;
@ -1497,15 +1497,18 @@ nfsd4_sequence(struct svc_rqst *rqstp,
cstate->slot = slot; cstate->slot = slot;
cstate->session = session; cstate->session = session;
replay_cache: /* Hold a session reference until done processing the compound:
/* Renew the clientid on success and on replay.
* Hold a session reference until done processing the compound:
* nfsd4_put_session called only if the cstate slot is set. * nfsd4_put_session called only if the cstate slot is set.
*/ */
renew_client(session->se_client);
nfsd4_get_session(session); nfsd4_get_session(session);
out: out:
spin_unlock(&sessionid_lock); spin_unlock(&sessionid_lock);
/* Renew the clientid on success and on replay */
if (cstate->session) {
nfs4_lock_state();
renew_client(session->se_client);
nfs4_unlock_state();
}
dprintk("%s: return %d\n", __func__, ntohl(status)); dprintk("%s: return %d\n", __func__, ntohl(status));
return status; return status;
} }