diff options
-rw-r--r-- | fs/nfs/namespace.c | 12 | ||||
-rw-r--r-- | include/linux/nfs_fs.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index 77b00684894d..60408646176b 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c | |||
@@ -26,6 +26,11 @@ LIST_HEAD(nfs_automount_list); | |||
26 | static DECLARE_WORK(nfs_automount_task, nfs_expire_automounts, &nfs_automount_list); | 26 | static DECLARE_WORK(nfs_automount_task, nfs_expire_automounts, &nfs_automount_list); |
27 | int nfs_mountpoint_expiry_timeout = 500 * HZ; | 27 | int nfs_mountpoint_expiry_timeout = 500 * HZ; |
28 | 28 | ||
29 | static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent, | ||
30 | const struct dentry *dentry, | ||
31 | struct nfs_fh *fh, | ||
32 | struct nfs_fattr *fattr); | ||
33 | |||
29 | /* | 34 | /* |
30 | * nfs_path - reconstruct the path given an arbitrary dentry | 35 | * nfs_path - reconstruct the path given an arbitrary dentry |
31 | * @base - arbitrary string to prepend to the path | 36 | * @base - arbitrary string to prepend to the path |
@@ -209,9 +214,10 @@ static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server, | |||
209 | * @fattr - attributes for new root inode | 214 | * @fattr - attributes for new root inode |
210 | * | 215 | * |
211 | */ | 216 | */ |
212 | struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent, | 217 | static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent, |
213 | const struct dentry *dentry, struct nfs_fh *fh, | 218 | const struct dentry *dentry, |
214 | struct nfs_fattr *fattr) | 219 | struct nfs_fh *fh, |
220 | struct nfs_fattr *fattr) | ||
215 | { | 221 | { |
216 | struct nfs_clone_mount mountdata = { | 222 | struct nfs_clone_mount mountdata = { |
217 | .sb = mnt_parent->mnt_sb, | 223 | .sb = mnt_parent->mnt_sb, |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 36f5bcf513b0..98c9b9f667a5 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -315,10 +315,6 @@ extern void nfs_end_data_update(struct inode *); | |||
315 | extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx); | 315 | extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx); |
316 | extern void put_nfs_open_context(struct nfs_open_context *ctx); | 316 | extern void put_nfs_open_context(struct nfs_open_context *ctx); |
317 | extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode); | 317 | extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode); |
318 | extern struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent, | ||
319 | const struct dentry *dentry, | ||
320 | struct nfs_fh *fh, | ||
321 | struct nfs_fattr *fattr); | ||
322 | 318 | ||
323 | /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */ | 319 | /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */ |
324 | extern u32 root_nfs_parse_addr(char *name); /*__init*/ | 320 | extern u32 root_nfs_parse_addr(char *name); /*__init*/ |