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

Commit f1c0a861 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Mark auth and cred operation tables as constant. 



Also do the same for gss_api operation tables.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent de7a8ce3

include/linux/sunrpc/auth.h

+6 −9
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct rpc_credops; 
struct rpc_cred {

	struct hlist_node	cr_hash;	/* hash chain */

	struct rpc_auth *	cr_auth;

	struct rpc_credops *	cr_ops;

	const struct rpc_credops *cr_ops;

	unsigned long		cr_expire;	/* when to gc */

	atomic_t		cr_count;	/* ref count */

	unsigned short		cr_flags;	/* various flags */
@@ -73,7 +73,7 @@ struct rpc_auth { 
	unsigned int		au_verfsize;



	unsigned int		au_flags;	/* various flags */

	struct rpc_authops *	au_ops;		/* operations */

	const struct rpc_authops *au_ops;		/* operations */

	rpc_authflavor_t	au_flavor;	/* pseudoflavor (note may

						 * differ from the flavor in

						 * au_ops->au_flavor in gss
@@ -119,14 +119,11 @@ struct rpc_credops { 
						void *, __be32 *, void *);

};



extern struct rpc_authops	authunix_ops;

extern struct rpc_authops	authnull_ops;

#ifdef CONFIG_SUNRPC_SECURE

extern struct rpc_authops	authdes_ops;

#endif

extern const struct rpc_authops	authunix_ops;

extern const struct rpc_authops	authnull_ops;



int			rpcauth_register(struct rpc_authops *);

int			rpcauth_unregister(struct rpc_authops *);

int			rpcauth_register(const struct rpc_authops *);

int			rpcauth_unregister(const struct rpc_authops *);

struct rpc_auth *	rpcauth_create(rpc_authflavor_t, struct rpc_clnt *);

void			rpcauth_release(struct rpc_auth *);

struct rpc_cred *	rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int);

include/linux/sunrpc/gss_api.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct gss_api_mech { 
	struct module		*gm_owner;

	struct xdr_netobj	gm_oid;

	char			*gm_name;

	struct gss_api_ops	*gm_ops;

	const struct gss_api_ops *gm_ops;

	/* pseudoflavors supported by this mechanism: */

	int			gm_pf_num;

	struct pf_desc *	gm_pfs;

net/sunrpc/auth.c

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#endif



static DEFINE_SPINLOCK(rpc_authflavor_lock);

static struct rpc_authops *	auth_flavors[RPC_AUTH_MAXFLAVOR] = {

static const struct rpc_authops *auth_flavors[RPC_AUTH_MAXFLAVOR] = {

	&authnull_ops,		/* AUTH_NULL */

	&authunix_ops,		/* AUTH_UNIX */

	NULL,			/* others can be loadable modules */
@@ -33,7 +33,7 @@ pseudoflavor_to_flavor(u32 flavor) { 
}



int

rpcauth_register(struct rpc_authops *ops)

rpcauth_register(const struct rpc_authops *ops)

{

	rpc_authflavor_t flavor;

	int ret = -EPERM;
@@ -50,7 +50,7 @@ rpcauth_register(struct rpc_authops *ops) 
}



int

rpcauth_unregister(struct rpc_authops *ops)

rpcauth_unregister(const struct rpc_authops *ops)

{

	rpc_authflavor_t flavor;

	int ret = -EPERM;
@@ -70,7 +70,7 @@ struct rpc_auth * 
rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt)

{

	struct rpc_auth		*auth;

	struct rpc_authops	*ops;

	const struct rpc_authops *ops;

	u32			flavor = pseudoflavor_to_flavor(pseudoflavor);



	auth = ERR_PTR(-EINVAL);

net/sunrpc/auth_gss/auth_gss.c

+4 −4
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ 
#include <linux/sunrpc/gss_api.h>

#include <asm/uaccess.h>



static struct rpc_authops authgss_ops;

static const struct rpc_authops authgss_ops;



static struct rpc_credops gss_credops;

static const struct rpc_credops gss_credops;



#ifdef RPC_DEBUG

# define RPCDBG_FACILITY	RPCDBG_AUTH
@@ -1193,7 +1193,7 @@ gss_unwrap_resp(struct rpc_task *task, 
	return status;

}



static struct rpc_authops authgss_ops = {

static const struct rpc_authops authgss_ops = {

	.owner		= THIS_MODULE,

	.au_flavor	= RPC_AUTH_GSS,

#ifdef RPC_DEBUG
@@ -1205,7 +1205,7 @@ static struct rpc_authops authgss_ops = { 
	.crcreate	= gss_create_cred

};



static struct rpc_credops gss_credops = {

static const struct rpc_credops gss_credops = {

	.cr_name	= "AUTH_GSS",

	.crdestroy	= gss_destroy_cred,

	.cr_init	= gss_cred_init,

net/sunrpc/auth_gss/gss_krb5_mech.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ gss_delete_sec_context_kerberos(void *internal_ctx) { 
	kfree(kctx);

}



static struct gss_api_ops gss_kerberos_ops = {

static const struct gss_api_ops gss_kerberos_ops = {

	.gss_import_sec_context	= gss_import_sec_context_kerberos,

	.gss_get_mic		= gss_get_mic_kerberos,

	.gss_verify_mic		= gss_verify_mic_kerberos,