diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-09 15:14:15 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-09 15:14:15 -0400 |
commit | b693ba4a338da15db1db4b5ebaa36e4ab9781c82 (patch) | |
tree | 6c16b9ef282af0e958fa216310d4552303b525d5 /net/sunrpc | |
parent | 7b2aa037e878c939676675969983284a02958ae3 (diff) |
SUNRPC: Constify rpc_pipe_ops...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 8 | ||||
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 66d458fc6920..23eb3864ffc0 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c | |||
@@ -89,8 +89,8 @@ static struct rpc_wait_queue pipe_version_rpc_waitqueue; | |||
89 | static DECLARE_WAIT_QUEUE_HEAD(pipe_version_waitqueue); | 89 | static DECLARE_WAIT_QUEUE_HEAD(pipe_version_waitqueue); |
90 | 90 | ||
91 | static void gss_free_ctx(struct gss_cl_ctx *); | 91 | static void gss_free_ctx(struct gss_cl_ctx *); |
92 | static struct rpc_pipe_ops gss_upcall_ops_v0; | 92 | static const struct rpc_pipe_ops gss_upcall_ops_v0; |
93 | static struct rpc_pipe_ops gss_upcall_ops_v1; | 93 | static const struct rpc_pipe_ops gss_upcall_ops_v1; |
94 | 94 | ||
95 | static inline struct gss_cl_ctx * | 95 | static inline struct gss_cl_ctx * |
96 | gss_get_ctx(struct gss_cl_ctx *ctx) | 96 | gss_get_ctx(struct gss_cl_ctx *ctx) |
@@ -1507,7 +1507,7 @@ static const struct rpc_credops gss_nullops = { | |||
1507 | .crunwrap_resp = gss_unwrap_resp, | 1507 | .crunwrap_resp = gss_unwrap_resp, |
1508 | }; | 1508 | }; |
1509 | 1509 | ||
1510 | static struct rpc_pipe_ops gss_upcall_ops_v0 = { | 1510 | static const struct rpc_pipe_ops gss_upcall_ops_v0 = { |
1511 | .upcall = gss_pipe_upcall, | 1511 | .upcall = gss_pipe_upcall, |
1512 | .downcall = gss_pipe_downcall, | 1512 | .downcall = gss_pipe_downcall, |
1513 | .destroy_msg = gss_pipe_destroy_msg, | 1513 | .destroy_msg = gss_pipe_destroy_msg, |
@@ -1515,7 +1515,7 @@ static struct rpc_pipe_ops gss_upcall_ops_v0 = { | |||
1515 | .release_pipe = gss_pipe_release, | 1515 | .release_pipe = gss_pipe_release, |
1516 | }; | 1516 | }; |
1517 | 1517 | ||
1518 | static struct rpc_pipe_ops gss_upcall_ops_v1 = { | 1518 | static const struct rpc_pipe_ops gss_upcall_ops_v1 = { |
1519 | .upcall = gss_pipe_upcall, | 1519 | .upcall = gss_pipe_upcall, |
1520 | .downcall = gss_pipe_downcall, | 1520 | .downcall = gss_pipe_downcall, |
1521 | .destroy_msg = gss_pipe_destroy_msg, | 1521 | .destroy_msg = gss_pipe_destroy_msg, |
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 9ced0628d69c..f6f60f625e3f 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -125,7 +125,7 @@ static void | |||
125 | rpc_close_pipes(struct inode *inode) | 125 | rpc_close_pipes(struct inode *inode) |
126 | { | 126 | { |
127 | struct rpc_inode *rpci = RPC_I(inode); | 127 | struct rpc_inode *rpci = RPC_I(inode); |
128 | struct rpc_pipe_ops *ops; | 128 | const struct rpc_pipe_ops *ops; |
129 | int need_release; | 129 | int need_release; |
130 | 130 | ||
131 | mutex_lock(&inode->i_mutex); | 131 | mutex_lock(&inode->i_mutex); |
@@ -776,8 +776,9 @@ rpc_rmdir(struct dentry *dentry) | |||
776 | * The @private argument passed here will be available to all these methods | 776 | * The @private argument passed here will be available to all these methods |
777 | * from the file pointer, via RPC_I(file->f_dentry->d_inode)->private. | 777 | * from the file pointer, via RPC_I(file->f_dentry->d_inode)->private. |
778 | */ | 778 | */ |
779 | struct dentry * | 779 | struct dentry *rpc_mkpipe(struct dentry *parent, const char *name, |
780 | rpc_mkpipe(struct dentry *parent, const char *name, void *private, struct rpc_pipe_ops *ops, int flags) | 780 | void *private, const struct rpc_pipe_ops *ops, |
781 | int flags) | ||
781 | { | 782 | { |
782 | struct dentry *dentry; | 783 | struct dentry *dentry; |
783 | struct inode *dir, *inode; | 784 | struct inode *dir, *inode; |