2 files changed, 8 insertions, 3 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 23ab145daa2d..a3191f023490 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1030,7 +1030,7 @@ error:
  * Create an NFS4 referral server record
  */
 struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
-                                               struct nfs_fh *fh)
+                                               struct nfs_fh *mntfh)
 {
         struct nfs_client *parent_client;
         struct nfs_server *server, *parent_server;
@@ -1069,8 +1069,13 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
         BUG_ON(!server->nfs_client->rpc_ops);
         BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops);
 
+        /* Probe the root fh to retrieve its FSID and filehandle */
+        error = nfs4_path_walk(server, mntfh, data->mnt_path);
+        if (error < 0)
+                goto error;
+
         /* probe the filesystem info for this server filesystem */
-        error = nfs_probe_fsinfo(server, fh, &fattr);
+        error = nfs_probe_fsinfo(server, mntfh, &fattr);
         if (error < 0)
                 goto error;
 
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 28108c82b887..89da0a38c12c 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1044,7 +1044,7 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags,
                 nfs4_fill_super(s);
         }
 
-        mntroot = nfs4_get_root(s, data->fh);
+        mntroot = nfs4_get_root(s, &mntfh);
         if (IS_ERR(mntroot)) {
                 error = PTR_ERR(mntroot);
                 goto error_splat_super;