Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9496ff4 authored by Al Viro's avatar Al Viro
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b0446be4

fs/namespace.c

+1 −2
Original line number Diff line number Diff line
@@ -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

 * @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;
@@ -2080,7 +2080,6 @@ struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt) 
	}

	return new_ns;

}

EXPORT_SYMBOL(create_mnt_ns);



SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,

		char __user *, type, unsigned long, flags, void __user *, data)

fs/nfs/super.c

+0 −8
Original line number Diff line number Diff line
@@ -2648,21 +2648,13 @@ static void nfs_fix_devname(const struct path *path, struct vfsmount *mnt) 
static int nfs_follow_remote_path(struct vfsmount *root_mnt,

		const char *export_path, struct vfsmount *mnt_target)

{

	struct mnt_namespace *ns_private;

	struct nameidata nd;

	struct super_block *s;

	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,

			export_path, LOOKUP_FOLLOW, &nd);



	put_mnt_ns(ns_private);



	if (ret != 0)

		goto out_err;

include/linux/mnt_namespace.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ struct proc_mounts { 


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 *,

		struct fs_struct *);

extern void put_mnt_ns(struct mnt_namespace *ns);