diff options
author | Andy Adamson <andros@netapp.com> | 2009-04-01 09:22:46 -0400 |
---|---|---|
committer | Benny Halevy <bhalevy@panasas.com> | 2009-06-17 15:25:11 -0400 |
commit | a7b721037f898b29a8083da59b1dccd3da385b07 (patch) | |
tree | 57d0fba7528118a9d4dcd8395adbdb91956fcb17 /fs/nfs/nfs4_fs.h | |
parent | 8e69514f2981d85108c2bd220ff8e188c0c27cdb (diff) |
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: Benny Halevy <bhalevy@panasas.com>
[nfs41: get cred in exchange_id when cred arg is NULL]
Signed-off-by: Benny 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: Andy Adamson <andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
-rw-r--r-- | fs/nfs/nfs4_fs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 095bf4690e84..2b141c5758ec 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h | |||
@@ -182,6 +182,7 @@ struct nfs4_state_recovery_ops { | |||
182 | 182 | ||
183 | struct nfs4_state_maintenance_ops { | 183 | struct nfs4_state_maintenance_ops { |
184 | int (*sched_state_renewal)(struct nfs_client *, struct rpc_cred *); | 184 | int (*sched_state_renewal)(struct nfs_client *, struct rpc_cred *); |
185 | struct rpc_cred * (*get_state_renewal_cred_locked)(struct nfs_client *); | ||
185 | int (*renew_lease)(struct nfs_client *, struct rpc_cred *); | 186 | int (*renew_lease)(struct nfs_client *, struct rpc_cred *); |
186 | }; | 187 | }; |
187 | 188 | ||
@@ -240,7 +241,11 @@ extern void nfs4_kill_renewd(struct nfs_client *); | |||
240 | extern void nfs4_renew_state(struct work_struct *); | 241 | extern void nfs4_renew_state(struct work_struct *); |
241 | 242 | ||
242 | /* nfs4state.c */ | 243 | /* nfs4state.c */ |
244 | struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp); | ||
243 | struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp); | 245 | struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp); |
246 | #if defined(CONFIG_NFS_V4_1) | ||
247 | struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp); | ||
248 | #endif /* CONFIG_NFS_V4_1 */ | ||
244 | 249 | ||
245 | extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *); | 250 | extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *); |
246 | extern void nfs4_put_state_owner(struct nfs4_state_owner *); | 251 | extern void nfs4_put_state_owner(struct nfs4_state_owner *); |