The patch titled
fs/nfs/: make code static
has been added to the -mm tree. Its filename is
fs-nfs-make-code-static.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fs/nfs/: make code static
From: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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(-)
diff -puN fs/nfs/namespace.c~fs-nfs-make-code-static fs/nfs/namespace.c
--- a/fs/nfs/namespace.c~fs-nfs-make-code-static
+++ a/fs/nfs/namespace.c
@@ -25,6 +25,11 @@ LIST_HEAD(nfs_automount_list);
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
@@ -197,9 +202,10 @@ static struct vfsmount *nfs_do_clone_mou
* @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,
diff -puN fs/nfs/super.c~fs-nfs-make-code-static fs/nfs/super.c
--- a/fs/nfs/super.c~fs-nfs-make-code-static
+++ a/fs/nfs/super.c
@@ -92,12 +92,14 @@ struct rpc_stat nfs_rpcstat = {
#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),
diff -puN include/linux/nfs_fs.h~fs-nfs-make-code-static include/linux/nfs_fs.h
--- a/include/linux/nfs_fs.h~fs-nfs-make-code-static
+++ a/include/linux/nfs_fs.h
@@ -312,10 +312,6 @@ extern void nfs_end_data_update(struct i
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*/
diff -puN include/linux/nfs_xdr.h~fs-nfs-make-code-static include/linux/nfs_xdr.h
--- a/include/linux/nfs_xdr.h~fs-nfs-make-code-static
+++ a/include/linux/nfs_xdr.h
@@ -837,6 +837,5 @@ extern struct rpc_version nfs_version3;
extern struct rpc_version nfs_version4;
extern struct rpc_version nfsacl_version3;
-extern struct rpc_program nfsacl_program;
#endif
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
kernel-printkc-export_symbol_unused.patch
mm-bootmemc-export_unused_symbol.patch
mm-memoryc-export_unused_symbol.patch
mm-mmzonec-export_unused_symbol.patch
fs-read_writec-export_unused_symbol.patch
kernel-softirqc-export_unused_symbol.patch
git-alsa.patch
git-gfs2.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
make-variables-static-after-klibc-merge.patch
git-libata-all.patch
drivers-net-e1000-possible-cleanups.patch
fs-nfs-make-2-functions-static.patch
fs-nfs-make-code-static.patch
git-pcmcia.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-arcmsr-cleanups.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
task-watchers-register-semundo-task-watcher.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-implement-clone_newuts-flag.patch
fs-reiser4-possible-cleanups.patch
the-scheduled-removal-of-some-oss-drivers.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
