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

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

SUNRPC: Constify rpc_pipe_ops... 



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

fs/nfs/idmap.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void idmap_pipe_destroy_msg(struct rpc_pipe_msg *); 


static unsigned int fnvhash32(const void *, size_t);



static struct rpc_pipe_ops idmap_upcall_ops = {

static const struct rpc_pipe_ops idmap_upcall_ops = {

	.upcall		= idmap_pipe_upcall,

	.downcall	= idmap_pipe_downcall,

	.destroy_msg	= idmap_pipe_destroy_msg,

include/linux/sunrpc/rpc_pipe_fs.h

+3 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ struct rpc_inode { 
	wait_queue_head_t waitq;

#define RPC_PIPE_WAIT_FOR_OPEN	1

	int flags;

	struct rpc_pipe_ops *ops;

	struct delayed_work queue_timeout;

	const struct rpc_pipe_ops *ops;

};



static inline struct rpc_inode *
@@ -46,7 +46,8 @@ extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *); 


extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *);

extern int rpc_rmdir(struct dentry *);

extern struct dentry *rpc_mkpipe(struct dentry *, const char *, void *, struct rpc_pipe_ops *, int flags);

extern struct dentry *rpc_mkpipe(struct dentry *, const char *, void *,

				 const struct rpc_pipe_ops *, int flags);

extern int rpc_unlink(struct dentry *);

extern struct vfsmount *rpc_get_mount(void);

extern void rpc_put_mount(void);

net/sunrpc/auth_gss/auth_gss.c

+4 −4
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ static struct rpc_wait_queue pipe_version_rpc_waitqueue; 
static DECLARE_WAIT_QUEUE_HEAD(pipe_version_waitqueue);



static void gss_free_ctx(struct gss_cl_ctx *);

static struct rpc_pipe_ops gss_upcall_ops_v0;

static struct rpc_pipe_ops gss_upcall_ops_v1;

static const struct rpc_pipe_ops gss_upcall_ops_v0;

static const struct rpc_pipe_ops gss_upcall_ops_v1;



static inline struct gss_cl_ctx *

gss_get_ctx(struct gss_cl_ctx *ctx)
@@ -1507,7 +1507,7 @@ static const struct rpc_credops gss_nullops = { 
	.crunwrap_resp	= gss_unwrap_resp,

};



static struct rpc_pipe_ops gss_upcall_ops_v0 = {

static const struct rpc_pipe_ops gss_upcall_ops_v0 = {

	.upcall		= gss_pipe_upcall,

	.downcall	= gss_pipe_downcall,

	.destroy_msg	= gss_pipe_destroy_msg,
@@ -1515,7 +1515,7 @@ static struct rpc_pipe_ops gss_upcall_ops_v0 = { 
	.release_pipe	= gss_pipe_release,

};



static struct rpc_pipe_ops gss_upcall_ops_v1 = {

static const struct rpc_pipe_ops gss_upcall_ops_v1 = {

	.upcall		= gss_pipe_upcall,

	.downcall	= gss_pipe_downcall,

	.destroy_msg	= gss_pipe_destroy_msg,

net/sunrpc/rpc_pipe.c

+4 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void 
rpc_close_pipes(struct inode *inode)

{

	struct rpc_inode *rpci = RPC_I(inode);

	struct rpc_pipe_ops *ops;

	const struct rpc_pipe_ops *ops;

	int need_release;



	mutex_lock(&inode->i_mutex);
@@ -776,8 +776,9 @@ rpc_rmdir(struct dentry *dentry) 
 * The @private argument passed here will be available to all these methods

 * from the file pointer, via RPC_I(file->f_dentry->d_inode)->private.

 */

struct dentry *

rpc_mkpipe(struct dentry *parent, const char *name, void *private, struct rpc_pipe_ops *ops, int flags)

struct dentry *rpc_mkpipe(struct dentry *parent, const char *name,

			  void *private, const struct rpc_pipe_ops *ops,

			  int flags)

{

	struct dentry *dentry;

	struct inode *dir, *inode;