Commit 5b596830 authored by Donald Buczek's avatar Donald Buczek Committed by Trond Myklebust
Browse files

nfs4.0: Refetch lease_time after clientid update 



RFC 7530 requires us to refetch the lease time attribute once a new
clientID is established. This is already implemented for the
nfs4.1(+) clients by nfs41_init_clientid, which calls
nfs41_finish_session_reset, which calls nfs4_setup_state_renewal.

To make nfs4_setup_state_renewal available for nfs4.0, move it
further to the top of the source file to include it regardles of
CONFIG_NFS_V4_1 and to save a forward declaration.

Call nfs4_setup_state_renewal from nfs4_init_clientid.

Signed-off-by: default avatarDonald Buczek <buczek@molgen.mpg.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent ea51efaa

fs/nfs/nfs4state.c

+22 −22
Original line number Diff line number Diff line
@@ -87,6 +87,27 @@ const nfs4_stateid current_stateid = { 


static DEFINE_MUTEX(nfs_clid_init_mutex);



static int nfs4_setup_state_renewal(struct nfs_client *clp)

{

	int status;

	struct nfs_fsinfo fsinfo;

	unsigned long now;



	if (!test_bit(NFS_CS_CHECK_LEASE_TIME, &clp->cl_res_state)) {

		nfs4_schedule_state_renewal(clp);

		return 0;

	}



	now = jiffies;

	status = nfs4_proc_get_lease_time(clp, &fsinfo);

	if (status == 0) {

		nfs4_set_lease_period(clp, fsinfo.lease_time * HZ, now);

		nfs4_schedule_state_renewal(clp);

	}



	return status;

}



int nfs4_init_clientid(struct nfs_client *clp, const struct cred *cred)

{

	struct nfs4_setclientid_res clid = {
@@ -114,7 +135,7 @@ do_confirm: 
	if (status != 0)

		goto out;

	clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

	nfs4_schedule_state_renewal(clp);

	nfs4_setup_state_renewal(clp);

out:

	return status;

}
@@ -286,27 +307,6 @@ static int nfs4_begin_drain_session(struct nfs_client *clp) 


#if defined(CONFIG_NFS_V4_1)



static int nfs4_setup_state_renewal(struct nfs_client *clp)

{

	int status;

	struct nfs_fsinfo fsinfo;

	unsigned long now;



	if (!test_bit(NFS_CS_CHECK_LEASE_TIME, &clp->cl_res_state)) {

		nfs4_schedule_state_renewal(clp);

		return 0;

	}



	now = jiffies;

	status = nfs4_proc_get_lease_time(clp, &fsinfo);

	if (status == 0) {

		nfs4_set_lease_period(clp, fsinfo.lease_time * HZ, now);

		nfs4_schedule_state_renewal(clp);

	}



	return status;

}



static void nfs41_finish_session_reset(struct nfs_client *clp)

{

	clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE