diff --git a/[refs] b/[refs]
index b39b6cecef60..6b45cec9aef9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 246408dcd5dfeef2df437ccb0ef4d6ee87805f58
+refs/heads/master: 4667058b772857069378aa8f417203156e315e82
diff --git a/trunk/fs/nfs/getroot.c b/trunk/fs/nfs/getroot.c
index b5ffe8fa291f..79796521cfdc 100644
--- a/trunk/fs/nfs/getroot.c
+++ b/trunk/fs/nfs/getroot.c
@@ -199,6 +199,10 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)
 		goto out;
 	}
 
+	if (fattr->valid & NFS_ATTR_FATTR_FSID &&
+	    !nfs_fsid_equal(&server->fsid, &fattr->fsid))
+		memcpy(&server->fsid, &fattr->fsid, sizeof(server->fsid));
+
 	inode = nfs_fhget(sb, mntfh, fattr);
 	if (IS_ERR(inode)) {
 		dprintk("nfs_get_root: get root inode failed\n");