aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/auth.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2018-12-02 19:30:31 -0500
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2018-12-19 13:52:46 -0500
commitd6efccd97e6de25e002d658593675ce8e07ceb8c (patch)
tree7ce0dc4f130065043f14160e2703403299af8f3b /net/sunrpc/auth.c
parent89a4f758d9f55f197c2a461f61ffa4a75127b30d (diff)
SUNRPC: remove crbind rpc_cred operation
This now always just does get_rpccred(), so we don't need an operation pointer to know to do that. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc/auth.c')
-rw-r--r--net/sunrpc/auth.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 2debbaba7809..867ea9834bde 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -658,15 +658,6 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred,
658} 658}
659EXPORT_SYMBOL_GPL(rpcauth_init_cred); 659EXPORT_SYMBOL_GPL(rpcauth_init_cred);
660 660
661struct rpc_cred *
662rpcauth_generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred, int lookupflags)
663{
664 dprintk("RPC: %5u holding %s cred %p\n", task->tk_pid,
665 cred->cr_auth->au_ops->au_name, cred);
666 return get_rpccred(cred);
667}
668EXPORT_SYMBOL_GPL(rpcauth_generic_bind_cred);
669
670static struct rpc_cred * 661static struct rpc_cred *
671rpcauth_bind_root_cred(struct rpc_task *task, int lookupflags) 662rpcauth_bind_root_cred(struct rpc_task *task, int lookupflags)
672{ 663{
@@ -724,8 +715,7 @@ rpcauth_bindcred(struct rpc_task *task, const struct cred *cred, int flags)
724 lookupflags |= RPCAUTH_LOOKUP_NEW; 715 lookupflags |= RPCAUTH_LOOKUP_NEW;
725 if (task->tk_op_cred) 716 if (task->tk_op_cred)
726 /* Task must use exactly this rpc_cred */ 717 /* Task must use exactly this rpc_cred */
727 new = task->tk_op_cred->cr_ops->crbind(task, task->tk_op_cred, 718 new = get_rpccred(task->tk_op_cred);
728 lookupflags);
729 else if (cred != NULL && cred != &machine_cred) 719 else if (cred != NULL && cred != &machine_cred)
730 new = auth->au_ops->lookup_cred(auth, &acred, lookupflags); 720 new = auth->au_ops->lookup_cred(auth, &acred, lookupflags);
731 else if (cred == &machine_cred) 721 else if (cred == &machine_cred)