From 502ee6dffd8ca917c9dd866119d692aa4ed942d7 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 23 Dec 2008 15:21:34 -0500
Subject: [PATCH] --- yaml --- r: 124709 b: refs/heads/master c:
 146ec944bbd31d241a44a00518b054fb01921d22 h: refs/heads/master i:   124707:
 e1173df4191b26d21594b29fe4fde9d8fa309195 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfs/internal.h      | 4 ++++
 trunk/fs/nfs/nfsroot.c       | 2 ++
 trunk/include/linux/nfs_fs.h | 6 ------
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 562c30d648c7..3420efa4417e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5d2b98e118716dd1ccc2808fae88f6c4b16d54
+refs/heads/master: 146ec944bbd31d241a44a00518b054fb01921d22
diff --git a/trunk/fs/nfs/internal.h b/trunk/fs/nfs/internal.h
index d212ee41caf2..7a38cc7b4137 100644
--- a/trunk/fs/nfs/internal.h
+++ b/trunk/fs/nfs/internal.h
@@ -63,6 +63,10 @@ struct nfs_parsed_mount_data {
 	struct security_mnt_opts lsm_opts;
 };
 
+/* mount_clnt.c */
+extern int nfs_mount(struct sockaddr *, size_t, char *, char *,
+					int, int, struct nfs_fh *);
+
 /* client.c */
 extern struct rpc_program nfs_program;
 
diff --git a/trunk/fs/nfs/nfsroot.c b/trunk/fs/nfs/nfsroot.c
index f1c0a066439f..a96e5fdb38af 100644
--- a/trunk/fs/nfs/nfsroot.c
+++ b/trunk/fs/nfs/nfsroot.c
@@ -86,6 +86,8 @@
 #include <net/ipconfig.h>
 #include <linux/parser.h>
 
+#include "internal.h"
+
 /* Define this to allow debugging output */
 #undef NFSROOT_DEBUG
 #define NFSDBG_FACILITY NFSDBG_ROOT
diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h
index 4eaa8347a0d9..f11077285a6c 100644
--- a/trunk/include/linux/nfs_fs.h
+++ b/trunk/include/linux/nfs_fs.h
@@ -532,12 +532,6 @@ static inline void nfs3_forget_cached_acls(struct inode *inode)
 }
 #endif /* CONFIG_NFS_V3_ACL */
 
-/*
- * linux/fs/mount_clnt.c
- */
-extern int  nfs_mount(struct sockaddr *, size_t, char *, char *,
-		      int, int, struct nfs_fh *);
-
 /*
  * inline functions
  */