mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
NFSv4.1: Ensure that reclaim_complete uses the right credential
We want to use the same credential for reclaim_complete as we used for the exchange_id call. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
9556000d8c
commit
965e9c23de
3 changed files with 14 additions and 5 deletions
|
@ -194,7 +194,7 @@ struct nfs4_state_recovery_ops {
|
|||
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 *);
|
||||
int (*reclaim_complete)(struct nfs_client *);
|
||||
int (*reclaim_complete)(struct nfs_client *, struct rpc_cred *);
|
||||
int (*detect_trunking)(struct nfs_client *, struct nfs_client **,
|
||||
struct rpc_cred *);
|
||||
};
|
||||
|
|
|
@ -6159,12 +6159,14 @@ static const struct rpc_call_ops nfs4_reclaim_complete_call_ops = {
|
|||
/*
|
||||
* Issue a global reclaim complete.
|
||||
*/
|
||||
static int nfs41_proc_reclaim_complete(struct nfs_client *clp)
|
||||
static int nfs41_proc_reclaim_complete(struct nfs_client *clp,
|
||||
struct rpc_cred *cred)
|
||||
{
|
||||
struct nfs4_reclaim_complete_data *calldata;
|
||||
struct rpc_task *task;
|
||||
struct rpc_message msg = {
|
||||
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RECLAIM_COMPLETE],
|
||||
.rpc_cred = cred,
|
||||
};
|
||||
struct rpc_task_setup task_setup_data = {
|
||||
.rpc_client = clp->cl_rpcclient,
|
||||
|
|
|
@ -1563,11 +1563,12 @@ static void nfs4_state_start_reclaim_reboot(struct nfs_client *clp)
|
|||
}
|
||||
|
||||
static void nfs4_reclaim_complete(struct nfs_client *clp,
|
||||
const struct nfs4_state_recovery_ops *ops)
|
||||
const struct nfs4_state_recovery_ops *ops,
|
||||
struct rpc_cred *cred)
|
||||
{
|
||||
/* Notify the server we're done reclaiming our state */
|
||||
if (ops->reclaim_complete)
|
||||
(void)ops->reclaim_complete(clp);
|
||||
(void)ops->reclaim_complete(clp, cred);
|
||||
}
|
||||
|
||||
static void nfs4_clear_reclaim_server(struct nfs_server *server)
|
||||
|
@ -1612,9 +1613,15 @@ static int nfs4_state_clear_reclaim_reboot(struct nfs_client *clp)
|
|||
|
||||
static void nfs4_state_end_reclaim_reboot(struct nfs_client *clp)
|
||||
{
|
||||
const struct nfs4_state_recovery_ops *ops;
|
||||
struct rpc_cred *cred;
|
||||
|
||||
if (!nfs4_state_clear_reclaim_reboot(clp))
|
||||
return;
|
||||
nfs4_reclaim_complete(clp, clp->cl_mvops->reboot_recovery_ops);
|
||||
ops = clp->cl_mvops->reboot_recovery_ops;
|
||||
cred = ops->get_clid_cred(clp);
|
||||
nfs4_reclaim_complete(clp, ops, cred);
|
||||
put_rpccred(cred);
|
||||
}
|
||||
|
||||
static void nfs_delegation_clear_all(struct nfs_client *clp)
|
||||
|
|
Loading…
Reference in a new issue