aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-04-09 00:36:44 +0000
committerSteve French <sfrench@us.ibm.com>2009-04-17 01:26:49 +0000
commit2d6d589d8009b37ae03244059c93e0e8cf46910e (patch)
tree654ed166f84bd36ee612dc7e654dab230456f09c /fs
parentcifs: vary timeout on writes past EOF based on offset (try #5) (diff)
downloadlinux-dev-2d6d589d8009b37ae03244059c93e0e8cf46910e.tar.xz
linux-dev-2d6d589d8009b37ae03244059c93e0e8cf46910e.zip
[CIFS] remove some build warnings
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/connect.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 6926023af878..01e280cab066 100644
--- a/fs/cifs/connect.c
+++ b/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();