mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
nfs41: lease renewal
Send a NFSv4.1 SEQUENCE op rather than RENEW that was deprecated in minorversion 1. Use the nfs_client minorversion to select reboot_recover/ network_partition_recovery/state_renewal ops. Note: we use reclaimer to create the nfs41 session before there are any cl_superblocks for the nfs_client. Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: check for session not minorversion] Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [revamped patch for new nfs4_state_manager design] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: obliterate nfs4_state_recovery_ops.renew_lease method] moved to nfs4_state_maintenance_ops [also undid per-minorversion nfs4_state_recovery_ops here] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
b069d94af7
commit
29fba38b79
3 changed files with 33 additions and 1 deletions
|
@ -180,6 +180,10 @@ struct nfs4_state_recovery_ops {
|
|||
int (*recover_lock)(struct nfs4_state *, struct file_lock *);
|
||||
};
|
||||
|
||||
struct nfs4_state_maintenance_ops {
|
||||
int (*sched_state_renewal)(struct nfs_client *, struct rpc_cred *);
|
||||
};
|
||||
|
||||
extern const struct dentry_operations nfs4_dentry_operations;
|
||||
extern const struct inode_operations nfs4_dir_inode_operations;
|
||||
|
||||
|
@ -220,6 +224,8 @@ static inline int nfs4_setup_sequence(struct nfs_client *clp,
|
|||
}
|
||||
#endif /* CONFIG_NFS_V4_1 */
|
||||
|
||||
extern struct nfs4_state_maintenance_ops *nfs4_state_renewal_ops[];
|
||||
|
||||
extern const u32 nfs4_fattr_bitmap[2];
|
||||
extern const u32 nfs4_statfs_bitmap[2];
|
||||
extern const u32 nfs4_pathconf_bitmap[2];
|
||||
|
|
|
@ -3016,6 +3016,9 @@ static void nfs4_renew_done(struct rpc_task *task, void *data)
|
|||
if (time_before(clp->cl_last_renewal,timestamp))
|
||||
clp->cl_last_renewal = timestamp;
|
||||
spin_unlock(&clp->cl_lock);
|
||||
dprintk("%s calling put_rpccred on rpc_cred %p\n", __func__,
|
||||
task->tk_msg.rpc_cred);
|
||||
put_rpccred(task->tk_msg.rpc_cred);
|
||||
}
|
||||
|
||||
static const struct rpc_call_ops nfs4_renew_ops = {
|
||||
|
@ -4790,6 +4793,27 @@ struct nfs4_state_recovery_ops nfs4_nograce_recovery_ops = {
|
|||
.recover_lock = nfs4_lock_expired,
|
||||
};
|
||||
|
||||
struct nfs4_state_maintenance_ops nfs40_state_renewal_ops = {
|
||||
.sched_state_renewal = nfs4_proc_async_renew,
|
||||
};
|
||||
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = {
|
||||
.sched_state_renewal = nfs41_proc_async_sequence,
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Per minor version reboot and network partition recovery ops
|
||||
*/
|
||||
|
||||
struct nfs4_state_maintenance_ops *nfs4_state_renewal_ops[] = {
|
||||
&nfs40_state_renewal_ops,
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
&nfs41_state_renewal_ops,
|
||||
#endif
|
||||
};
|
||||
|
||||
static const struct inode_operations nfs4_file_inode_operations = {
|
||||
.permission = nfs_permission,
|
||||
.getattr = nfs_getattr,
|
||||
|
|
|
@ -59,12 +59,14 @@
|
|||
void
|
||||
nfs4_renew_state(struct work_struct *work)
|
||||
{
|
||||
struct nfs4_state_maintenance_ops *ops;
|
||||
struct nfs_client *clp =
|
||||
container_of(work, struct nfs_client, cl_renewd.work);
|
||||
struct rpc_cred *cred;
|
||||
long lease, timeout;
|
||||
unsigned long last, now;
|
||||
|
||||
ops = nfs4_state_renewal_ops[clp->cl_minorversion];
|
||||
dprintk("%s: start\n", __func__);
|
||||
/* Are there any active superblocks? */
|
||||
if (list_empty(&clp->cl_superblocks))
|
||||
|
@ -86,7 +88,7 @@ nfs4_renew_state(struct work_struct *work)
|
|||
nfs_expire_all_delegations(clp);
|
||||
} else {
|
||||
/* Queue an asynchronous RENEW. */
|
||||
nfs4_proc_async_renew(clp, cred);
|
||||
ops->sched_state_renewal(clp, cred);
|
||||
put_rpccred(cred);
|
||||
}
|
||||
timeout = (2 * lease) / 3;
|
||||
|
|
Loading…
Reference in a new issue