Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b72103 authored by Andy Adamson's avatar Andy Adamson Committed by Benny Halevy
Browse files

nfs41: introduce get_state_renewal_cred 



Use the machine cred for sending SEQUENCE to renew
the client's lease.

[revamp patch for new state management design starting 2.6.29]
[nfs41: support minorversion 1 for nfs4_check_lease]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[nfs41: get cred in exchange_id when cred arg is NULL]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[nfs41: use cl_machined_cred instead of cl_ex_cred]
    Since EXCHANGE_ID insists on using the machine credential, cl_ex_cred is
    not needed. nfs4_proc_exchange_id() is only called if the machine credential
    is available. Remove the credential logic from nfs4_proc_exchange_id.
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 8e69514f

fs/nfs/nfs4_fs.h

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ struct nfs4_state_recovery_ops { 


struct nfs4_state_maintenance_ops {

	int (*sched_state_renewal)(struct nfs_client *, struct rpc_cred *);

	struct rpc_cred * (*get_state_renewal_cred_locked)(struct nfs_client *);

	int (*renew_lease)(struct nfs_client *, struct rpc_cred *);

};
@@ -240,7 +241,11 @@ extern void nfs4_kill_renewd(struct nfs_client *); 
extern void nfs4_renew_state(struct work_struct *);



/* nfs4state.c */

struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp);

struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp);

#if defined(CONFIG_NFS_V4_1)

struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp);

#endif /* CONFIG_NFS_V4_1 */



extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *);

extern void nfs4_put_state_owner(struct nfs4_state_owner *);

fs/nfs/nfs4proc.c

+3 −0
Original line number Diff line number Diff line
@@ -4236,6 +4236,7 @@ static int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred) 


	dprintk("--> %s\n", __func__);

	BUG_ON(clp == NULL);



	p = (u32 *)verifier.data;

	*p++ = htonl((u32)clp->cl_boot_time.tv_sec);

	*p = htonl((u32)clp->cl_boot_time.tv_nsec);
@@ -4795,12 +4796,14 @@ struct nfs4_state_recovery_ops nfs4_nograce_recovery_ops = { 


struct nfs4_state_maintenance_ops nfs40_state_renewal_ops = {

	.sched_state_renewal = nfs4_proc_async_renew,

	.get_state_renewal_cred_locked = nfs4_get_renew_cred_locked,

	.renew_lease = nfs4_proc_renew,

};



#if defined(CONFIG_NFS_V4_1)

struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = {

	.sched_state_renewal = nfs41_proc_async_sequence,

	.get_state_renewal_cred_locked = nfs4_get_machine_cred_locked,

	.renew_lease = nfs4_proc_sequence,

};

#endif

fs/nfs/nfs4renewd.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ nfs4_renew_state(struct work_struct *work) 
	timeout = (2 * lease) / 3 + (long)last - (long)now;

	/* Are we close to a lease timeout? */

	if (time_after(now, last + lease/3)) {

		cred = nfs4_get_renew_cred_locked(clp);

		cred = ops->get_state_renewal_cred_locked(clp);

		spin_unlock(&clp->cl_lock);

		if (cred == NULL) {

			if (list_empty(&clp->cl_delegations)) {

fs/nfs/nfs4state.c

+5 −13
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int nfs4_init_client(struct nfs_client *clp, struct rpc_cred *cred) 
	return status;

}



static struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp)

struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp)

{

	struct rpc_cred *cred = NULL;
@@ -114,17 +114,7 @@ struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp) 
	return cred;

}



static struct rpc_cred *nfs4_get_renew_cred(struct nfs_client *clp)

{

	struct rpc_cred *cred;



	spin_lock(&clp->cl_lock);

	cred = nfs4_get_renew_cred_locked(clp);

	spin_unlock(&clp->cl_lock);

	return cred;

}



static struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)

struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)

{

	struct nfs4_state_owner *sp;

	struct rb_node *pos;
@@ -1090,7 +1080,9 @@ static int nfs4_check_lease(struct nfs_client *clp) 
	/* Is the client already known to have an expired lease? */

	if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))

		return 0;

	cred = nfs4_get_renew_cred(clp);

	spin_lock(&clp->cl_lock);

	cred = ops->get_state_renewal_cred_locked(clp);

	spin_unlock(&clp->cl_lock);

	if (cred == NULL) {

		cred = nfs4_get_setclientid_cred(clp);

		if (cred == NULL)