adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2009-08-09 18:44:32 +04:00
parent b0446be4be
commit e9496ff46a
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/namespace.c
View file

@ -2068,7 +2068,7 @@ struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
* create_mnt_ns - creates a private namespace and adds a root filesystem * create_mnt_ns - creates a private namespace and adds a root filesystem
* @mnt: pointer to the new root filesystem mountpoint * @mnt: pointer to the new root filesystem mountpoint
*/ */
struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt) static struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt)
{ {
struct mnt_namespace *new_ns; struct mnt_namespace *new_ns;
@ -2080,7 +2080,6 @@ struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt)
} }
return new_ns; return new_ns;
} }
EXPORT_SYMBOL(create_mnt_ns);
SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name, SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
char __user *, type, unsigned long, flags, void __user *, data) char __user *, type, unsigned long, flags, void __user *, data)

8
fs/nfs/super.c
View file

@ -2648,21 +2648,13 @@ out_freepage:
static int nfs_follow_remote_path(struct vfsmount *root_mnt, static int nfs_follow_remote_path(struct vfsmount *root_mnt,
const char *export_path, struct vfsmount *mnt_target) const char *export_path, struct vfsmount *mnt_target)
{ {
struct mnt_namespace *ns_private;
struct nameidata nd; struct nameidata nd;
struct super_block *s; struct super_block *s;
int ret; int ret;
ns_private = create_mnt_ns(root_mnt);
ret = PTR_ERR(ns_private);
if (IS_ERR(ns_private))
goto out_mntput;
ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt, ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt,
export_path, LOOKUP_FOLLOW, &nd); export_path, LOOKUP_FOLLOW, &nd);
put_mnt_ns(ns_private);
if (ret != 0) if (ret != 0)
goto out_err; goto out_err;

1
include/linux/mnt_namespace.h
View file

@ -23,7 +23,6 @@ struct proc_mounts {
struct fs_struct; struct fs_struct;
extern struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt);
extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *,
struct fs_struct *); struct fs_struct *);
extern void put_mnt_ns(struct mnt_namespace *ns); extern void put_mnt_ns(struct mnt_namespace *ns);