aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/nfs4_fs.h1
-rw-r--r--fs/nfs/nfs4proc.c2
-rw-r--r--fs/nfs/nfs4state.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index df9e36319499..1da3e354de22 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -179,6 +179,7 @@ struct nfs4_state_recovery_ops {
179 int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *); 179 int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *);
180 int (*recover_lock)(struct nfs4_state *, struct file_lock *); 180 int (*recover_lock)(struct nfs4_state *, struct file_lock *);
181 int (*establish_clid)(struct nfs_client *, struct rpc_cred *); 181 int (*establish_clid)(struct nfs_client *, struct rpc_cred *);
182 struct rpc_cred * (*get_clid_cred)(struct nfs_client *);
182}; 183};
183 184
184struct nfs4_state_maintenance_ops { 185struct nfs4_state_maintenance_ops {
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index dd46339095ce..b4e5442efa6c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4786,6 +4786,7 @@ struct nfs4_state_recovery_ops nfs40_reboot_recovery_ops = {
4786 .recover_open = nfs4_open_reclaim, 4786 .recover_open = nfs4_open_reclaim,
4787 .recover_lock = nfs4_lock_reclaim, 4787 .recover_lock = nfs4_lock_reclaim,
4788 .establish_clid = nfs4_init_clientid, 4788 .establish_clid = nfs4_init_clientid,
4789 .get_clid_cred = nfs4_get_setclientid_cred,
4789}; 4790};
4790 4791
4791#if defined(CONFIG_NFS_V4_1) 4792#if defined(CONFIG_NFS_V4_1)
@@ -4804,6 +4805,7 @@ struct nfs4_state_recovery_ops nfs40_nograce_recovery_ops = {
4804 .recover_open = nfs4_open_expired, 4805 .recover_open = nfs4_open_expired,
4805 .recover_lock = nfs4_lock_expired, 4806 .recover_lock = nfs4_lock_expired,
4806 .establish_clid = nfs4_init_clientid, 4807 .establish_clid = nfs4_init_clientid,
4808 .get_clid_cred = nfs4_get_setclientid_cred,
4807}; 4809};
4808 4810
4809#if defined(CONFIG_NFS_V4_1) 4811#if defined(CONFIG_NFS_V4_1)
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index e17bd4412174..90e56072844b 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1102,7 +1102,7 @@ static int nfs4_reclaim_lease(struct nfs_client *clp)
1102 nfs4_reboot_recovery_ops[clp->cl_minorversion]; 1102 nfs4_reboot_recovery_ops[clp->cl_minorversion];
1103 int status = -ENOENT; 1103 int status = -ENOENT;
1104 1104
1105 cred = nfs4_get_setclientid_cred(clp); 1105 cred = ops->get_clid_cred(clp);
1106 if (cred != NULL) { 1106 if (cred != NULL) {
1107 status = ops->establish_clid(clp, cred); 1107 status = ops->establish_clid(clp, cred);
1108 put_rpccred(cred); 1108 put_rpccred(cred);