Commit d6efccd9 authored by NeilBrown's avatar NeilBrown Committed by Anna Schumaker
Browse files

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: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 89a4f758

include/linux/sunrpc/auth.h

+0 −2
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ struct rpc_credops { 
	void			(*crdestroy)(struct rpc_cred *);



	int			(*crmatch)(struct auth_cred *, struct rpc_cred *, int);

	struct rpc_cred *	(*crbind)(struct rpc_task *, struct rpc_cred *, int);

	__be32 *		(*crmarshal)(struct rpc_task *, __be32 *);

	int			(*crrefresh)(struct rpc_task *);

	__be32 *		(*crvalidate)(struct rpc_task *, __be32 *);
@@ -167,7 +166,6 @@ int rpcauth_list_flavors(rpc_authflavor_t *, int); 
struct rpc_cred *	rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int, gfp_t);

void			rpcauth_init_cred(struct rpc_cred *, const struct auth_cred *, struct rpc_auth *, const struct rpc_credops *);

struct rpc_cred *	rpcauth_lookupcred(struct rpc_auth *, int);

struct rpc_cred *	rpcauth_generic_bind_cred(struct rpc_task *, struct rpc_cred *, int);

void			put_rpccred(struct rpc_cred *);

__be32 *		rpcauth_marshcred(struct rpc_task *, __be32 *);

__be32 *		rpcauth_checkverf(struct rpc_task *, __be32 *);

net/sunrpc/auth.c

+1 −11
Original line number Diff line number Diff line
@@ -658,15 +658,6 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred, 
}

EXPORT_SYMBOL_GPL(rpcauth_init_cred);



struct rpc_cred *

rpcauth_generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred, int lookupflags)

{

	dprintk("RPC: %5u holding %s cred %p\n", task->tk_pid,

			cred->cr_auth->au_ops->au_name, cred);

	return get_rpccred(cred);

}

EXPORT_SYMBOL_GPL(rpcauth_generic_bind_cred);



static struct rpc_cred *

rpcauth_bind_root_cred(struct rpc_task *task, int lookupflags)

{
@@ -724,8 +715,7 @@ rpcauth_bindcred(struct rpc_task *task, const struct cred *cred, int flags) 
		lookupflags |= RPCAUTH_LOOKUP_NEW;

	if (task->tk_op_cred)

		/* Task must use exactly this rpc_cred */

		new = task->tk_op_cred->cr_ops->crbind(task, task->tk_op_cred,

						       lookupflags);

		new = get_rpccred(task->tk_op_cred);

	else if (cred != NULL && cred != &machine_cred)

		new = auth->au_ops->lookup_cred(auth, &acred, lookupflags);

	else if (cred == &machine_cred)

net/sunrpc/auth_gss/auth_gss.c

+0 −2
Original line number Diff line number Diff line
@@ -2095,7 +2095,6 @@ static const struct rpc_credops gss_credops = { 
	.cr_name		= "AUTH_GSS",

	.crdestroy		= gss_destroy_cred,

	.cr_init		= gss_cred_init,

	.crbind			= rpcauth_generic_bind_cred,

	.crmatch		= gss_match,

	.crmarshal		= gss_marshal,

	.crrefresh		= gss_refresh,
@@ -2110,7 +2109,6 @@ static const struct rpc_credops gss_credops = { 
static const struct rpc_credops gss_nullops = {

	.cr_name		= "AUTH_GSS",

	.crdestroy		= gss_destroy_nullcred,

	.crbind			= rpcauth_generic_bind_cred,

	.crmatch		= gss_match,

	.crmarshal		= gss_marshal,

	.crrefresh		= gss_refresh_null,

net/sunrpc/auth_null.c

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ static 
const struct rpc_credops null_credops = {

	.cr_name	= "AUTH_NULL",

	.crdestroy	= nul_destroy_cred,

	.crbind		= rpcauth_generic_bind_cred,

	.crmatch	= nul_match,

	.crmarshal	= nul_marshal,

	.crrefresh	= nul_refresh,

net/sunrpc/auth_unix.c

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ static 
const struct rpc_credops unix_credops = {

	.cr_name	= "AUTH_UNIX",

	.crdestroy	= unx_destroy_cred,

	.crbind		= rpcauth_generic_bind_cred,

	.crmatch	= unx_match,

	.crmarshal	= unx_marshal,

	.crrefresh	= unx_refresh,