Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 331bc71c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Convert the auth cred cache to use refcount_t 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 79b18181

include/linux/sunrpc/auth.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct rpc_auth { 
						 * differ from the flavor in

						 * au_ops->au_flavor in gss

						 * case) */

	atomic_t		au_count;	/* Reference counter */

	refcount_t		au_count;	/* Reference counter */



	struct rpc_cred_cache *	au_credcache;

	/* per-flavor data */

net/sunrpc/auth.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ EXPORT_SYMBOL_GPL(rpcauth_create); 
void

rpcauth_release(struct rpc_auth *auth)

{

	if (!atomic_dec_and_test(&auth->au_count))

	if (!refcount_dec_and_test(&auth->au_count))

		return;

	auth->au_ops->destroy(auth);

}

net/sunrpc/auth_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static const struct rpc_authops generic_auth_ops = { 


static struct rpc_auth generic_auth = {

	.au_ops = &generic_auth_ops,

	.au_count = ATOMIC_INIT(0),

	.au_count = REFCOUNT_INIT(1),

};



static bool generic_key_to_expire(struct rpc_cred *cred)

net/sunrpc/auth_gss/auth_gss.c

+2 −2
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ gss_create_new(const struct rpc_auth_create_args *args, struct rpc_clnt *clnt) 
	auth->au_flavor = flavor;

	if (gss_pseudoflavor_to_datatouch(gss_auth->mech, flavor))

		auth->au_flags |= RPCAUTH_AUTH_DATATOUCH;

	atomic_set(&auth->au_count, 1);

	refcount_set(&auth->au_count, 1);

	kref_init(&gss_auth->kref);



	err = rpcauth_init_credcache(auth);
@@ -1187,7 +1187,7 @@ gss_auth_find_or_add_hashed(const struct rpc_auth_create_args *args, 
			if (strcmp(gss_auth->target_name, args->target_name))

				continue;

		}

		if (!atomic_inc_not_zero(&gss_auth->rpc_auth.au_count))

		if (!refcount_inc_not_zero(&gss_auth->rpc_auth.au_count))

			continue;

		goto out;

	}

net/sunrpc/auth_null.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static struct rpc_cred null_cred; 
static struct rpc_auth *

nul_create(const struct rpc_auth_create_args *args, struct rpc_clnt *clnt)

{

	atomic_inc(&null_auth.au_count);

	refcount_inc(&null_auth.au_count);

	return &null_auth;

}
@@ -119,7 +119,7 @@ struct rpc_auth null_auth = { 
	.au_flags	= RPCAUTH_AUTH_NO_CRKEY_TIMEOUT,

	.au_ops		= &authnull_ops,

	.au_flavor	= RPC_AUTH_NULL,

	.au_count	= ATOMIC_INIT(0),

	.au_count	= REFCOUNT_INIT(1),

};



static