diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-16 07:05:45 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-16 16:48:06 -0400 |
commit | fd462fb51db46c84bea0fc377c11b9a7e16bc1a0 (patch) | |
tree | 6b7c8ae99ebc26a663b765034985256b944eeef4 /fs/nfs | |
parent | c7f404b40a3665d9f4e9a927cc5c1ee0479ed8f9 (diff) |
nfs: stop mangling ->mnt_devname on NFS
now we can do that - nobody cares about its value anymore.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/super.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 79bc61fe2868..3f967cee4072 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -2799,26 +2799,6 @@ static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type, | |||
2799 | return root_mnt; | 2799 | return root_mnt; |
2800 | } | 2800 | } |
2801 | 2801 | ||
2802 | static void nfs_fix_devname(struct dentry *dentry, struct vfsmount *mnt) | ||
2803 | { | ||
2804 | char *page = (char *) __get_free_page(GFP_KERNEL); | ||
2805 | char *devname, *tmp; | ||
2806 | char *dummy; | ||
2807 | |||
2808 | if (page == NULL) | ||
2809 | return; | ||
2810 | devname = nfs_path(&dummy, dentry, page, PAGE_SIZE); | ||
2811 | if (IS_ERR(devname)) | ||
2812 | goto out_freepage; | ||
2813 | tmp = kstrdup(devname, GFP_KERNEL); | ||
2814 | if (tmp == NULL) | ||
2815 | goto out_freepage; | ||
2816 | kfree(mnt->mnt_devname); | ||
2817 | mnt->mnt_devname = tmp; | ||
2818 | out_freepage: | ||
2819 | free_page((unsigned long)page); | ||
2820 | } | ||
2821 | |||
2822 | struct nfs_referral_count { | 2802 | struct nfs_referral_count { |
2823 | struct list_head list; | 2803 | struct list_head list; |
2824 | const struct task_struct *task; | 2804 | const struct task_struct *task; |
@@ -2920,9 +2900,6 @@ static int nfs_follow_remote_path(struct vfsmount *root_mnt, | |||
2920 | mnt_target->mnt_sb = s; | 2900 | mnt_target->mnt_sb = s; |
2921 | mnt_target->mnt_root = dget(nd->path.dentry); | 2901 | mnt_target->mnt_root = dget(nd->path.dentry); |
2922 | 2902 | ||
2923 | /* Correct the device pathname */ | ||
2924 | nfs_fix_devname(nd->path.dentry, mnt_target); | ||
2925 | |||
2926 | path_put(&nd->path); | 2903 | path_put(&nd->path); |
2927 | kfree(nd); | 2904 | kfree(nd); |
2928 | down_write(&s->s_umount); | 2905 | down_write(&s->s_umount); |