diff options
author | Benny Halevy <bhalevy@panasas.com> | 2009-04-01 09:22:45 -0400 |
---|---|---|
committer | Benny Halevy <bhalevy@panasas.com> | 2009-06-17 15:25:10 -0400 |
commit | 8e69514f2981d85108c2bd220ff8e188c0c27cdb (patch) | |
tree | b106990c6ac0a286ae449afe8f0d781abcb754fe /fs/nfs/nfs4state.c | |
parent | 29fba38b793225798104a1ac870e6807ebd078dd (diff) |
nfs41: support minorversion 1 for nfs4_check_lease
[moved nfs4_get_renew_cred related changes to
"nfs41: introduce get_state_renewal_cred"]
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r-- | fs/nfs/nfs4state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 8b7f007adc42..dc5599c7f4d9 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -1083,6 +1083,8 @@ restart: | |||
1083 | static int nfs4_check_lease(struct nfs_client *clp) | 1083 | static int nfs4_check_lease(struct nfs_client *clp) |
1084 | { | 1084 | { |
1085 | struct rpc_cred *cred; | 1085 | struct rpc_cred *cred; |
1086 | struct nfs4_state_maintenance_ops *ops = | ||
1087 | nfs4_state_renewal_ops[clp->cl_minorversion]; | ||
1086 | int status = -NFS4ERR_EXPIRED; | 1088 | int status = -NFS4ERR_EXPIRED; |
1087 | 1089 | ||
1088 | /* Is the client already known to have an expired lease? */ | 1090 | /* Is the client already known to have an expired lease? */ |
@@ -1094,7 +1096,7 @@ static int nfs4_check_lease(struct nfs_client *clp) | |||
1094 | if (cred == NULL) | 1096 | if (cred == NULL) |
1095 | goto out; | 1097 | goto out; |
1096 | } | 1098 | } |
1097 | status = nfs4_proc_renew(clp, cred); | 1099 | status = ops->renew_lease(clp, cred); |
1098 | put_rpccred(cred); | 1100 | put_rpccred(cred); |
1099 | out: | 1101 | out: |
1100 | nfs4_recovery_handle_error(clp, status); | 1102 | nfs4_recovery_handle_error(clp, status); |