diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-08-09 10:44:32 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 12:16:44 -0500 |
commit | e9496ff46a20a8592fdc7bdaaf41b45eb808d310 (patch) | |
tree | 6668789814bf4726a82ad282724b72a09e247175 /fs/nfs | |
parent | b0446be4be44768c7c7e919fadda98e1315fad09 (diff) |
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index ce907efc5508..d5b112bcf3de 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -2648,21 +2648,13 @@ out_freepage: | |||
2648 | static int nfs_follow_remote_path(struct vfsmount *root_mnt, | 2648 | static int nfs_follow_remote_path(struct vfsmount *root_mnt, |
2649 | const char *export_path, struct vfsmount *mnt_target) | 2649 | const char *export_path, struct vfsmount *mnt_target) |
2650 | { | 2650 | { |
2651 | struct mnt_namespace *ns_private; | ||
2652 | struct nameidata nd; | 2651 | struct nameidata nd; |
2653 | struct super_block *s; | 2652 | struct super_block *s; |
2654 | int ret; | 2653 | int ret; |
2655 | 2654 | ||
2656 | ns_private = create_mnt_ns(root_mnt); | ||
2657 | ret = PTR_ERR(ns_private); | ||
2658 | if (IS_ERR(ns_private)) | ||
2659 | goto out_mntput; | ||
2660 | |||
2661 | ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt, | 2655 | ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt, |
2662 | export_path, LOOKUP_FOLLOW, &nd); | 2656 | export_path, LOOKUP_FOLLOW, &nd); |
2663 | 2657 | ||
2664 | put_mnt_ns(ns_private); | ||
2665 | |||
2666 | if (ret != 0) | 2658 | if (ret != 0) |
2667 | goto out_err; | 2659 | goto out_err; |
2668 | 2660 | ||