diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2008-12-23 15:21:34 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:34 -0500 |
commit | 146ec944bbd31d241a44a00518b054fb01921d22 (patch) | |
tree | 603c2fc810b9ca6cdec363275c18f00a0105e9ec | |
parent | 7b5d2b98e118716dd1ccc2808fae88f6c4b16d54 (diff) |
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>
-rw-r--r-- | fs/nfs/internal.h | 4 | ||||
-rw-r--r-- | fs/nfs/nfsroot.c | 2 | ||||
-rw-r--r-- | include/linux/nfs_fs.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index d212ee41caf2..7a38cc7b4137 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
@@ -63,6 +63,10 @@ struct nfs_parsed_mount_data { | |||
63 | struct security_mnt_opts lsm_opts; | 63 | struct security_mnt_opts lsm_opts; |
64 | }; | 64 | }; |
65 | 65 | ||
66 | /* mount_clnt.c */ | ||
67 | extern int nfs_mount(struct sockaddr *, size_t, char *, char *, | ||
68 | int, int, struct nfs_fh *); | ||
69 | |||
66 | /* client.c */ | 70 | /* client.c */ |
67 | extern struct rpc_program nfs_program; | 71 | extern struct rpc_program nfs_program; |
68 | 72 | ||
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index f1c0a066439f..a96e5fdb38af 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c | |||
@@ -86,6 +86,8 @@ | |||
86 | #include <net/ipconfig.h> | 86 | #include <net/ipconfig.h> |
87 | #include <linux/parser.h> | 87 | #include <linux/parser.h> |
88 | 88 | ||
89 | #include "internal.h" | ||
90 | |||
89 | /* Define this to allow debugging output */ | 91 | /* Define this to allow debugging output */ |
90 | #undef NFSROOT_DEBUG | 92 | #undef NFSROOT_DEBUG |
91 | #define NFSDBG_FACILITY NFSDBG_ROOT | 93 | #define NFSDBG_FACILITY NFSDBG_ROOT |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 4eaa8347a0d9..f11077285a6c 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -533,12 +533,6 @@ static inline void nfs3_forget_cached_acls(struct inode *inode) | |||
533 | #endif /* CONFIG_NFS_V3_ACL */ | 533 | #endif /* CONFIG_NFS_V3_ACL */ |
534 | 534 | ||
535 | /* | 535 | /* |
536 | * linux/fs/mount_clnt.c | ||
537 | */ | ||
538 | extern int nfs_mount(struct sockaddr *, size_t, char *, char *, | ||
539 | int, int, struct nfs_fh *); | ||
540 | |||
541 | /* | ||
542 | * inline functions | 536 | * inline functions |
543 | */ | 537 | */ |
544 | 538 | ||