diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/connect.c | 8 |
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) | |||
2231 | return; | 2231 | return; |
2232 | } | 2232 | } |
2233 | 2233 | ||
2234 | #ifdef CONFIG_CIFS_DFS_UPCALL | ||
2234 | /* build_path_to_root returns full path to root when | 2235 | /* build_path_to_root returns full path to root when |
2235 | * we do not have an exiting connection (tcon) */ | 2236 | * we do not have an exiting connection (tcon) */ |
2236 | static char * | 2237 | static char * |
@@ -2260,6 +2261,7 @@ build_unc_path_to_root(const struct smb_vol *volume_info, | |||
2260 | full_path[unc_len + cifs_sb->prepathlen] = 0; /* add trailing null */ | 2261 | full_path[unc_len + cifs_sb->prepathlen] = 0; /* add trailing null */ |
2261 | return full_path; | 2262 | return full_path; |
2262 | } | 2263 | } |
2264 | #endif | ||
2263 | 2265 | ||
2264 | int | 2266 | int |
2265 | cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | 2267 | 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, | |||
2272 | struct cifsTconInfo *tcon = NULL; | 2274 | struct cifsTconInfo *tcon = NULL; |
2273 | struct TCP_Server_Info *srvTcp = NULL; | 2275 | struct TCP_Server_Info *srvTcp = NULL; |
2274 | char *full_path; | 2276 | char *full_path; |
2277 | char *mount_data = mount_data_global; | ||
2278 | #ifdef CONFIG_CIFS_DFS_UPCALL | ||
2275 | struct dfs_info3_param *referrals = NULL; | 2279 | struct dfs_info3_param *referrals = NULL; |
2276 | unsigned int num_referrals = 0; | 2280 | unsigned int num_referrals = 0; |
2277 | |||
2278 | char *mount_data = mount_data_global; | ||
2279 | |||
2280 | try_mount_again: | 2281 | try_mount_again: |
2282 | #endif | ||
2281 | full_path = NULL; | 2283 | full_path = NULL; |
2282 | 2284 | ||
2283 | xid = GetXid(); | 2285 | xid = GetXid(); |