diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-01-10 08:04:48 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-01-31 18:20:27 -0500 |
| commit | 12bc372b96b35a2dc9245ec61369028932b82ea8 (patch) | |
| tree | 63bd7adfee1d632cf32a703bd714cde46ef82fda | |
| parent | 2561d618ffb615f92fe17f0cf6b03f8e5cddb2cb (diff) | |
SUNRPC: kernel PipeFS mount point creation routines removed
This patch removes static rpc_mnt variable and its creation and destruction
routines, because they are not used anymore.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | include/linux/sunrpc/rpc_pipe_fs.h | 2 | ||||
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 21 |
2 files changed, 0 insertions, 23 deletions
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h index ca32ebd14c18..426ce6eeee66 100644 --- a/include/linux/sunrpc/rpc_pipe_fs.h +++ b/include/linux/sunrpc/rpc_pipe_fs.h | |||
| @@ -90,8 +90,6 @@ void rpc_destroy_pipe_data(struct rpc_pipe *pipe); | |||
| 90 | extern struct dentry *rpc_mkpipe_dentry(struct dentry *, const char *, void *, | 90 | extern struct dentry *rpc_mkpipe_dentry(struct dentry *, const char *, void *, |
| 91 | struct rpc_pipe *); | 91 | struct rpc_pipe *); |
| 92 | extern int rpc_unlink(struct dentry *); | 92 | extern int rpc_unlink(struct dentry *); |
| 93 | extern struct vfsmount *rpc_get_mount(void); | ||
| 94 | extern void rpc_put_mount(void); | ||
| 95 | extern int register_rpc_pipefs(void); | 93 | extern int register_rpc_pipefs(void); |
| 96 | extern void unregister_rpc_pipefs(void); | 94 | extern void unregister_rpc_pipefs(void); |
| 97 | 95 | ||
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index bae4e71d8663..6873c9b51cc9 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | 19 | ||
| 20 | #include <asm/ioctls.h> | 20 | #include <asm/ioctls.h> |
| 21 | #include <linux/fs.h> | ||
| 22 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
| 23 | #include <linux/wait.h> | 22 | #include <linux/wait.h> |
| 24 | #include <linux/seq_file.h> | 23 | #include <linux/seq_file.h> |
| @@ -37,9 +36,6 @@ | |||
| 37 | 36 | ||
| 38 | #define NET_NAME(net) ((net == &init_net) ? " (init_net)" : "") | 37 | #define NET_NAME(net) ((net == &init_net) ? " (init_net)" : "") |
| 39 | 38 | ||
| 40 | static struct vfsmount *rpc_mnt __read_mostly; | ||
| 41 | static int rpc_mount_count; | ||
| 42 | |||
| 43 | static struct file_system_type rpc_pipe_fs_type; | 39 | static struct file_system_type rpc_pipe_fs_type; |
| 44 | 40 | ||
| 45 | 41 | ||
| @@ -449,23 +445,6 @@ struct rpc_filelist { | |||
| 449 | umode_t mode; | 445 | umode_t mode; |
| 450 | }; | 446 | }; |
| 451 | 447 | ||
| 452 | struct vfsmount *rpc_get_mount(void) | ||
| 453 | { | ||
| 454 | int err; | ||
| 455 | |||
| 456 | err = simple_pin_fs(&rpc_pipe_fs_type, &rpc_mnt, &rpc_mount_count); | ||
| 457 | if (err != 0) | ||
| 458 | return ERR_PTR(err); | ||
| 459 | return rpc_mnt; | ||
| 460 | } | ||
| 461 | EXPORT_SYMBOL_GPL(rpc_get_mount); | ||
| 462 | |||
| 463 | void rpc_put_mount(void) | ||
| 464 | { | ||
| 465 | simple_release_fs(&rpc_mnt, &rpc_mount_count); | ||
| 466 | } | ||
| 467 | EXPORT_SYMBOL_GPL(rpc_put_mount); | ||
| 468 | |||
| 469 | static int rpc_delete_dentry(const struct dentry *dentry) | 448 | static int rpc_delete_dentry(const struct dentry *dentry) |
| 470 | { | 449 | { |
| 471 | return 1; | 450 | return 1; |
