1 files changed, 7 insertions, 9 deletions

diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index b872779d7cd5..dd5fef20c702 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -16,6 +16,7 @@
 #include <linux/vfs.h>
 #include <linux/inet.h>
 #include "internal.h"
+#include "nfs4_fs.h"
 
 #define NFSDBG_FACILITY         NFSDBG_VFS
 
@@ -130,7 +131,6 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,
                 .authflavor = NFS_SB(mnt_parent->mnt_sb)->client->cl_auth->au_flavor,
         };
         char *page = NULL, *page2 = NULL;
-        char *devname;
         int loc, s, error;
 
         if (locations == NULL || locations->nlocations <= 0)
@@ -154,12 +154,6 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,
                 goto out;
         }
 
-        devname = nfs_devname(mnt_parent, dentry, page, PAGE_SIZE);
-        if (IS_ERR(devname)) {
-                mnt = (struct vfsmount *)devname;
-                goto out;
-        }
-
         loc = 0;
         while (loc < locations->nlocations && IS_ERR(mnt)) {
                 const struct nfs4_fs_location *location = &locations->locations[loc];
@@ -194,7 +188,11 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,
                         addr.sin_port = htons(NFS_PORT);
                         mountdata.addr = &addr;
 
-                        mnt = vfs_kern_mount(&nfs4_referral_fs_type, 0, devname, &mountdata);
+                        snprintf(page, PAGE_SIZE, "%s:%s",
+                                        mountdata.hostname,
+                                        mountdata.mnt_path);
+
+                        mnt = vfs_kern_mount(&nfs4_referral_fs_type, 0, page, &mountdata);
                         if (!IS_ERR(mnt)) {
                                 break;
                         }
@@ -242,7 +240,7 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentr
         dprintk("%s: getting locations for %s/%s\n",
                 __FUNCTION__, parent->d_name.name, dentry->d_name.name);
 
-        err = nfs4_proc_fs_locations(parent->d_inode, dentry, fs_locations, page);
+        err = nfs4_proc_fs_locations(parent->d_inode, &dentry->d_name, fs_locations, page);
         dput(parent);
         if (err != 0 ||
             fs_locations->nlocations <= 0 ||