summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-08-09 18:44:32 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-16 12:16:44 -0500
commite9496ff46a20a8592fdc7bdaaf41b45eb808d310 (patch)
tree6668789814bf4726a82ad282724b72a09e247175 /fs/nfs
parentb0446be4be44768c7c7e919fadda98e1315fad09 (diff)
downloadop-kernel-dev-e9496ff46a20a8592fdc7bdaaf41b45eb808d310.zip
op-kernel-dev-e9496ff46a20a8592fdc7bdaaf41b45eb808d310.tar.gz
fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/super.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index ce907ef..d5b112b 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2648,21 +2648,13 @@ out_freepage:
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;
OpenPOWER on IntegriCloud