mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
nfs41: nfs41_setup_state_renewal
Move call to get the lease time and the setup of the state renewal out of nfs4_create_session so that it can be called after clearing the DRAINING flag. We use the getattr RPC to obtain the lease time, which requires a sequence slot. Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
bcb56164ce
commit
9430fb6b53
3 changed files with 31 additions and 18 deletions
|
@ -225,6 +225,8 @@ extern struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp);
|
|||
extern int nfs4_proc_create_session(struct nfs_client *);
|
||||
extern int nfs4_proc_destroy_session(struct nfs4_session *);
|
||||
extern int nfs4_init_session(struct nfs_server *server);
|
||||
extern int nfs4_proc_get_lease_time(struct nfs_client *clp,
|
||||
struct nfs_fsinfo *fsinfo);
|
||||
#else /* CONFIG_NFS_v4_1 */
|
||||
static inline int nfs4_setup_sequence(struct nfs_client *clp,
|
||||
struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,
|
||||
|
|
|
@ -4745,7 +4745,6 @@ int nfs4_proc_create_session(struct nfs_client *clp)
|
|||
{
|
||||
int status;
|
||||
unsigned *ptr;
|
||||
struct nfs_fsinfo fsinfo;
|
||||
struct nfs4_session *session = clp->cl_session;
|
||||
|
||||
dprintk("--> %s clp=%p session=%p\n", __func__, clp, session);
|
||||
|
@ -4767,18 +4766,6 @@ int nfs4_proc_create_session(struct nfs_client *clp)
|
|||
ptr = (unsigned *)&session->sess_id.data[0];
|
||||
dprintk("%s client>seqid %d sessionid %u:%u:%u:%u\n", __func__,
|
||||
clp->cl_seqid, ptr[0], ptr[1], ptr[2], ptr[3]);
|
||||
|
||||
/* Get the lease time */
|
||||
status = nfs4_proc_get_lease_time(clp, &fsinfo);
|
||||
if (status == 0) {
|
||||
/* Update lease time and schedule renewal */
|
||||
spin_lock(&clp->cl_lock);
|
||||
clp->cl_lease_time = fsinfo.lease_time * HZ;
|
||||
clp->cl_last_renewal = jiffies;
|
||||
spin_unlock(&clp->cl_lock);
|
||||
|
||||
nfs4_schedule_state_renewal(clp);
|
||||
}
|
||||
out:
|
||||
dprintk("<-- %s\n", __func__);
|
||||
return status;
|
||||
|
|
|
@ -116,16 +116,38 @@ struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp)
|
|||
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
|
||||
static int nfs41_setup_state_renewal(struct nfs_client *clp)
|
||||
{
|
||||
int status;
|
||||
struct nfs_fsinfo fsinfo;
|
||||
|
||||
status = nfs4_proc_get_lease_time(clp, &fsinfo);
|
||||
if (status == 0) {
|
||||
/* Update lease time and schedule renewal */
|
||||
spin_lock(&clp->cl_lock);
|
||||
clp->cl_lease_time = fsinfo.lease_time * HZ;
|
||||
clp->cl_last_renewal = jiffies;
|
||||
spin_unlock(&clp->cl_lock);
|
||||
|
||||
nfs4_schedule_state_renewal(clp);
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
int nfs41_init_clientid(struct nfs_client *clp, struct rpc_cred *cred)
|
||||
{
|
||||
int status;
|
||||
|
||||
status = nfs4_proc_exchange_id(clp, cred);
|
||||
if (status == 0)
|
||||
/* create session schedules state renewal upon success */
|
||||
status = nfs4_proc_create_session(clp);
|
||||
if (status == 0)
|
||||
nfs_mark_client_ready(clp, NFS_CS_READY);
|
||||
if (status != 0)
|
||||
goto out;
|
||||
status = nfs4_proc_create_session(clp);
|
||||
if (status != 0)
|
||||
goto out;
|
||||
nfs41_setup_state_renewal(clp);
|
||||
nfs_mark_client_ready(clp, NFS_CS_READY);
|
||||
out:
|
||||
return status;
|
||||
}
|
||||
|
||||
|
@ -1248,6 +1270,8 @@ static int nfs4_reset_session(struct nfs_client *clp)
|
|||
/* Wake up the next rpc task even on error */
|
||||
clear_bit(NFS4CLNT_SESSION_DRAINING, &clp->cl_state);
|
||||
rpc_wake_up(&clp->cl_session->fc_slot_table.slot_tbl_waitq);
|
||||
if (status == 0)
|
||||
nfs41_setup_state_renewal(clp);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue