NFS: Correct the NFS mount path when following a referral

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 8e0673a0d6aac5fd7e8c22729b0b1769c96f9475..0b4cbdc60abd3b4874a2b4ec39cf71afe51d2190 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2559,6 +2559,27 @@ static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type,
        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,
                const char *export_path, struct vfsmount *mnt_target)
 {
@@ -2585,6 +2606,9 @@ static int nfs_follow_remote_path(struct vfsmount *root_mnt,
        mnt_target->mnt_sb = s;
        mnt_target->mnt_root = dget(nd.path.dentry);
 
+       /* Correct the device pathname */
+       nfs_fix_devname(&nd.path, mnt_target);
+
        path_put(&nd.path);
        down_write(&s->s_umount);
        return 0;