NFS: Move declaration of nfs_mount() to fs/nfs/internal.h

Clean up:  The nfs_mount() function is not to be used outside of the
NFS client.  Move its public declaration to fs/nfs/internal.h.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index d212ee41caf21ce069f92784b229a7214859c58a..7a38cc7b41373b99c94f5a7762f896af176d2f57 100644 (file)
--- a/fs/nfs/internal.h
+++ b/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/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index f1c0a066439f8651c7cdbf76cd6b65a7d6d6b110..a96e5fdb38af7a1f6e44da68cd4d9c1fccc2ac01 100644 (file)
--- a/fs/nfs/nfsroot.c
+++ b/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/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 4eaa8347a0d9ce08d09c7bb8436642e92c35fd0c..f11077285a6c060afcf8689928015c50e963d72b 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/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
  */