mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
nfs41: add a get_clid_cred function to nfs4_state_recovery_ops
EXCHANGE_ID has different credential requirements than SETCLIENTID. Prepare for a separate credential function. 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>
This commit is contained in:
parent
591d71cbde
commit
90a16617ee
3 changed files with 4 additions and 1 deletions
|
@ -179,6 +179,7 @@ struct nfs4_state_recovery_ops {
|
|||
int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *);
|
||||
int (*recover_lock)(struct nfs4_state *, struct file_lock *);
|
||||
int (*establish_clid)(struct nfs_client *, struct rpc_cred *);
|
||||
struct rpc_cred * (*get_clid_cred)(struct nfs_client *);
|
||||
};
|
||||
|
||||
struct nfs4_state_maintenance_ops {
|
||||
|
|
|
@ -4786,6 +4786,7 @@ struct nfs4_state_recovery_ops nfs40_reboot_recovery_ops = {
|
|||
.recover_open = nfs4_open_reclaim,
|
||||
.recover_lock = nfs4_lock_reclaim,
|
||||
.establish_clid = nfs4_init_clientid,
|
||||
.get_clid_cred = nfs4_get_setclientid_cred,
|
||||
};
|
||||
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
|
@ -4804,6 +4805,7 @@ struct nfs4_state_recovery_ops nfs40_nograce_recovery_ops = {
|
|||
.recover_open = nfs4_open_expired,
|
||||
.recover_lock = nfs4_lock_expired,
|
||||
.establish_clid = nfs4_init_clientid,
|
||||
.get_clid_cred = nfs4_get_setclientid_cred,
|
||||
};
|
||||
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
|
|
|
@ -1102,7 +1102,7 @@ static int nfs4_reclaim_lease(struct nfs_client *clp)
|
|||
nfs4_reboot_recovery_ops[clp->cl_minorversion];
|
||||
int status = -ENOENT;
|
||||
|
||||
cred = nfs4_get_setclientid_cred(clp);
|
||||
cred = ops->get_clid_cred(clp);
|
||||
if (cred != NULL) {
|
||||
status = ops->establish_clid(clp, cred);
|
||||
put_rpccred(cred);
|
||||
|
|
Loading…
Reference in a new issue