From e1153a1b68bf8d2661d328ac97b4a982857376e7 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Thu, 9 Apr 2009 00:36:44 +0000
Subject: [PATCH] --- yaml --- r: 143693 b: refs/heads/master c:
 2d6d589d8009b37ae03244059c93e0e8cf46910e h: refs/heads/master i:   143691:
 5ad143c636251ef5c13dcd617a64cf3a84541e32 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 530dc87736ba..5f7bfdc1ff7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbec9ab952d4810960e620035c8e95f0fbbae4be
+refs/heads/master: 2d6d589d8009b37ae03244059c93e0e8cf46910e
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 6926023af878..01e280cab066 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -2231,6 +2231,7 @@ cleanup_volume_info(struct smb_vol **pvolume_info)
 	return;
 }
 
+#ifdef CONFIG_CIFS_DFS_UPCALL
 /* build_path_to_root returns full path to root when
  * we do not have an exiting connection (tcon) */
 static char *
@@ -2260,6 +2261,7 @@ build_unc_path_to_root(const struct smb_vol *volume_info,
 	full_path[unc_len + cifs_sb->prepathlen] = 0; /* add trailing null */
 	return full_path;
 }
+#endif
 
 int
 cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
@@ -2272,12 +2274,12 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 	struct cifsTconInfo *tcon = NULL;
 	struct TCP_Server_Info *srvTcp = NULL;
 	char   *full_path;
+	char *mount_data = mount_data_global;
+#ifdef CONFIG_CIFS_DFS_UPCALL
 	struct dfs_info3_param *referrals = NULL;
 	unsigned int num_referrals = 0;
-
-	char *mount_data = mount_data_global;
-
 try_mount_again:
+#endif
 	full_path = NULL;
 
 	xid = GetXid();