From d3faba5e3648a12181d64df1740e2809da9b5d5c Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 2 Feb 2007 14:46:09 -0800
Subject: [PATCH] --- yaml --- r: 46070 b: refs/heads/master c:
 f2d0d85e58099d518cb50b1c95fc1fc62bbce1b8 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/nfs/client.c | 9 +++++++--
 trunk/fs/nfs/super.c  | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 65dc1eb2f86e..4bce35fbb4c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2efef837fb84f78cee7439804cb3722bffc64e75
+refs/heads/master: f2d0d85e58099d518cb50b1c95fc1fc62bbce1b8
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index 23ab145daa2d..a3191f023490 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -1030,7 +1030,7 @@ struct nfs_server *nfs4_create_server(const struct nfs4_mount_data *data,
  * 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/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 28108c82b887..89da0a38c12c 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/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;