* [-mm patch] fs/nfs/: make code static
2006-05-15 7:56 2.6.17-rc4-mm1 Andrew Morton
@ 2006-05-16 12:39 ` Adrian Bunk
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Bunk @ 2006-05-16 12:39 UTC (permalink / raw)
To: Andrew Morton, trond.myklebust; +Cc: linux-kernel
This patch makes needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/nfs/client.c | 6 ++++--
fs/nfs/internal.h | 2 --
fs/nfs/namespace.c | 12 +++++++++---
include/linux/nfs_fs.h | 4 ----
include/linux/nfs_xdr.h | 1 -
5 files changed, 13 insertions(+), 12 deletions(-)
--- linux-2.6.17-rc4-mm1-full/fs/nfs/internal.h.old 2006-05-16 13:11:54.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/fs/nfs/internal.h 2006-05-16 13:12:00.000000000 +0200
@@ -38,8 +38,6 @@
};
/* client.c */
-extern struct rpc_program nfs_program;
-
extern void nfs_put_client(struct nfs_client *);
extern struct nfs_client *nfs_find_client(struct sockaddr_in *, int);
extern struct nfs_server *nfs_create_server(struct nfs_mount_data *,
--- linux-2.6.17-rc4-mm1-full/include/linux/nfs_xdr.h.old 2006-05-16 13:12:07.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/include/linux/nfs_xdr.h 2006-05-16 13:12:20.000000000 +0200
@@ -838,6 +838,5 @@
extern struct rpc_version nfs_version4;
extern struct rpc_version nfsacl_version3;
-extern struct rpc_program nfsacl_program;
#endif
--- linux-2.6.17-rc4-mm1-full/fs/nfs/client.c.old 2006-05-16 13:12:32.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/fs/nfs/client.c 2006-05-16 13:25:59.000000000 +0200
@@ -75,7 +75,7 @@
#endif
};
-struct rpc_program nfs_program = {
+static struct rpc_program nfs_program = {
.name = "nfs",
.number = NFS_PROGRAM,
.nrvers = ARRAY_SIZE(nfs_version),
@@ -90,12 +90,14 @@
#ifdef CONFIG_NFS_V3_ACL
+static struct rpc_program nfsacl_program;
+
static struct rpc_stat nfsacl_rpcstat = { &nfsacl_program };
static struct rpc_version * nfsacl_version[] = {
[3] = &nfsacl_version3,
};
-struct rpc_program nfsacl_program = {
+static struct rpc_program nfsacl_program = {
.name = "nfsacl",
.number = NFS_ACL_PROGRAM,
.nrvers = ARRAY_SIZE(nfsacl_version),
--- linux-2.6.17-rc4-mm1-full/include/linux/nfs_fs.h.old 2006-05-16 13:13:54.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/include/linux/nfs_fs.h 2006-05-16 13:14:01.000000000 +0200
@@ -312,10 +312,6 @@
extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
extern void put_nfs_open_context(struct nfs_open_context *ctx);
extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode);
-extern struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
- const struct dentry *dentry,
- struct nfs_fh *fh,
- struct nfs_fattr *fattr);
/* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */
extern u32 root_nfs_parse_addr(char *name); /*__init*/
--- linux-2.6.17-rc4-mm1-full/fs/nfs/namespace.c.old 2006-05-16 13:14:52.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/fs/nfs/namespace.c 2006-05-16 13:14:33.000000000 +0200
@@ -26,6 +26,11 @@
static DECLARE_WORK(nfs_automount_task, nfs_expire_automounts, &nfs_automount_list);
int nfs_mountpoint_expiry_timeout = 500 * HZ;
+static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
+ const struct dentry *dentry,
+ struct nfs_fh *fh,
+ struct nfs_fattr *fattr);
+
/*
* nfs_path - reconstruct the path given an arbitrary dentry
* @base - arbitrary string to prepend to the path
@@ -206,9 +211,10 @@
* @fattr - attributes for new root inode
*
*/
-struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
- const struct dentry *dentry, struct nfs_fh *fh,
- struct nfs_fattr *fattr)
+static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
+ const struct dentry *dentry,
+ struct nfs_fh *fh,
+ struct nfs_fattr *fattr)
{
struct nfs_clone_mount mountdata = {
.sb = mnt_parent->mnt_sb,
^ permalink raw reply [flat|nested] 3+ messages in thread
* [-mm patch] fs/nfs/: make code static
@ 2006-06-22 10:03 Adrian Bunk
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Bunk @ 2006-06-22 10:03 UTC (permalink / raw)
To: trond.myklebust; +Cc: linux-kernel
This patch makes needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/nfs/namespace.c | 12 +++++++++---
fs/nfs/super.c | 4 +++-
include/linux/nfs_fs.h | 4 ----
include/linux/nfs_xdr.h | 1 -
4 files changed, 12 insertions(+), 9 deletions(-)
This patch makes needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
--- linux-2.6.17-rc4-mm1-full/include/linux/nfs_fs.h.old 2006-05-16 13:13:54.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/include/linux/nfs_fs.h 2006-05-16 13:14:01.000000000 +0200
@@ -312,10 +312,6 @@
extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
extern void put_nfs_open_context(struct nfs_open_context *ctx);
extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode);
-extern struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
- const struct dentry *dentry,
- struct nfs_fh *fh,
- struct nfs_fattr *fattr);
/* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */
extern u32 root_nfs_parse_addr(char *name); /*__init*/
--- linux-2.6.17-rc4-mm1-full/fs/nfs/namespace.c.old 2006-05-16 13:14:52.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/fs/nfs/namespace.c 2006-05-16 13:14:33.000000000 +0200
@@ -26,6 +26,11 @@
static DECLARE_WORK(nfs_automount_task, nfs_expire_automounts, &nfs_automount_list);
int nfs_mountpoint_expiry_timeout = 500 * HZ;
+static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
+ const struct dentry *dentry,
+ struct nfs_fh *fh,
+ struct nfs_fattr *fattr);
+
/*
* nfs_path - reconstruct the path given an arbitrary dentry
* @base - arbitrary string to prepend to the path
@@ -206,9 +211,10 @@
* @fattr - attributes for new root inode
*
*/
-struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
- const struct dentry *dentry, struct nfs_fh *fh,
- struct nfs_fattr *fattr)
+static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
+ const struct dentry *dentry,
+ struct nfs_fh *fh,
+ struct nfs_fattr *fattr)
{
struct nfs_clone_mount mountdata = {
.sb = mnt_parent->mnt_sb,
--- linux-2.6.17-mm1-full/include/linux/nfs_xdr.h.old 2006-06-22 02:00:39.000000000 +0200
+++ linux-2.6.17-mm1-full/include/linux/nfs_xdr.h 2006-06-22 02:00:47.000000000 +0200
@@ -835,6 +835,5 @@
extern struct rpc_version nfs_version4;
extern struct rpc_version nfsacl_version3;
-extern struct rpc_program nfsacl_program;
#endif
--- linux-2.6.17-mm1-full/fs/nfs/super.c.old 2006-06-22 02:00:57.000000000 +0200
+++ linux-2.6.17-mm1-full/fs/nfs/super.c 2006-06-22 02:13:26.000000000 +0200
@@ -92,12 +92,14 @@
#ifdef CONFIG_NFS_V3_ACL
+static struct rpc_program nfsacl_program;
+
static struct rpc_stat nfsacl_rpcstat = { &nfsacl_program };
static struct rpc_version * nfsacl_version[] = {
[3] = &nfsacl_version3,
};
-struct rpc_program nfsacl_program = {
+static struct rpc_program nfsacl_program = {
.name = "nfsacl",
.number = NFS_ACL_PROGRAM,
.nrvers = ARRAY_SIZE(nfsacl_version),
^ permalink raw reply [flat|nested] 3+ messages in thread
* [-mm patch] fs/nfs/: make code static
@ 2006-06-29 19:20 Adrian Bunk
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Bunk @ 2006-06-29 19:20 UTC (permalink / raw)
To: trond.myklebust; +Cc: linux-kernel
This patch makes needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 22 Jun 2006
fs/nfs/namespace.c | 12 +++++++++---
fs/nfs/super.c | 4 +++-
include/linux/nfs_fs.h | 4 ----
include/linux/nfs_xdr.h | 1 -
4 files changed, 12 insertions(+), 9 deletions(-)
--- linux-2.6.17-rc4-mm1-full/include/linux/nfs_fs.h.old 2006-05-16 13:13:54.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/include/linux/nfs_fs.h 2006-05-16 13:14:01.000000000 +0200
@@ -312,10 +312,6 @@
extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
extern void put_nfs_open_context(struct nfs_open_context *ctx);
extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode);
-extern struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
- const struct dentry *dentry,
- struct nfs_fh *fh,
- struct nfs_fattr *fattr);
/* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */
extern u32 root_nfs_parse_addr(char *name); /*__init*/
--- linux-2.6.17-rc4-mm1-full/fs/nfs/namespace.c.old 2006-05-16 13:14:52.000000000 +0200
+++ linux-2.6.17-rc4-mm1-full/fs/nfs/namespace.c 2006-05-16 13:14:33.000000000 +0200
@@ -26,6 +26,11 @@
static DECLARE_WORK(nfs_automount_task, nfs_expire_automounts, &nfs_automount_list);
int nfs_mountpoint_expiry_timeout = 500 * HZ;
+static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
+ const struct dentry *dentry,
+ struct nfs_fh *fh,
+ struct nfs_fattr *fattr);
+
/*
* nfs_path - reconstruct the path given an arbitrary dentry
* @base - arbitrary string to prepend to the path
@@ -206,9 +211,10 @@
* @fattr - attributes for new root inode
*
*/
-struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
- const struct dentry *dentry, struct nfs_fh *fh,
- struct nfs_fattr *fattr)
+static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
+ const struct dentry *dentry,
+ struct nfs_fh *fh,
+ struct nfs_fattr *fattr)
{
struct nfs_clone_mount mountdata = {
.sb = mnt_parent->mnt_sb,
--- linux-2.6.17-mm1-full/include/linux/nfs_xdr.h.old 2006-06-22 02:00:39.000000000 +0200
+++ linux-2.6.17-mm1-full/include/linux/nfs_xdr.h 2006-06-22 02:00:47.000000000 +0200
@@ -835,6 +835,5 @@
extern struct rpc_version nfs_version4;
extern struct rpc_version nfsacl_version3;
-extern struct rpc_program nfsacl_program;
#endif
--- linux-2.6.17-mm1-full/fs/nfs/super.c.old 2006-06-22 02:00:57.000000000 +0200
+++ linux-2.6.17-mm1-full/fs/nfs/super.c 2006-06-22 02:13:26.000000000 +0200
@@ -92,12 +92,14 @@
#ifdef CONFIG_NFS_V3_ACL
+static struct rpc_program nfsacl_program;
+
static struct rpc_stat nfsacl_rpcstat = { &nfsacl_program };
static struct rpc_version * nfsacl_version[] = {
[3] = &nfsacl_version3,
};
-struct rpc_program nfsacl_program = {
+static struct rpc_program nfsacl_program = {
.name = "nfsacl",
.number = NFS_ACL_PROGRAM,
.nrvers = ARRAY_SIZE(nfsacl_version),
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-06-29 19:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-22 10:03 [-mm patch] fs/nfs/: make code static Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2006-06-29 19:20 Adrian Bunk
2006-05-15 7:56 2.6.17-rc4-mm1 Andrew Morton
2006-05-16 12:39 ` [-mm patch] fs/nfs/: make code static Adrian Bunk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.