Commit b88f8a54 authored by Trond Myklebust's avatar Trond Myklebust Committed by Linus Torvalds

NFS: Correct the NFS mount path when following a referral

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b75b35c
...@@ -2559,6 +2559,27 @@ static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type, ...@@ -2559,6 +2559,27 @@ static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type,
return root_mnt; return root_mnt;
} }
static void nfs_fix_devname(const struct path *path, struct vfsmount *mnt)
{
char *page = (char *) __get_free_page(GFP_KERNEL);
char *devname, *tmp;
if (page == NULL)
return;
devname = nfs_path(path->mnt->mnt_devname,
path->mnt->mnt_root, path->dentry,
page, PAGE_SIZE);
if (devname == NULL)
goto out_freepage;
tmp = kstrdup(devname, GFP_KERNEL);
if (tmp == NULL)
goto out_freepage;
kfree(mnt->mnt_devname);
mnt->mnt_devname = tmp;
out_freepage:
free_page((unsigned long)page);
}
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)
{ {
...@@ -2585,6 +2606,9 @@ static int nfs_follow_remote_path(struct vfsmount *root_mnt, ...@@ -2585,6 +2606,9 @@ static int nfs_follow_remote_path(struct vfsmount *root_mnt,
mnt_target->mnt_sb = s; mnt_target->mnt_sb = s;
mnt_target->mnt_root = dget(nd.path.dentry); mnt_target->mnt_root = dget(nd.path.dentry);
/* Correct the device pathname */
nfs_fix_devname(&nd.path, mnt_target);
path_put(&nd.path); path_put(&nd.path);
down_write(&s->s_umount); down_write(&s->s_umount);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment