diff options
author | Steve French <smfrench@gmail.com> | 2012-11-28 23:34:41 -0500 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-12-05 14:27:28 -0500 |
commit | 6d3ea7e4975aed451fbee4dea2fef63b0de8cb4f (patch) | |
tree | 499881d40ec894a38bf017328fb48ebbaa30ec1b /fs/cifs/connect.c | |
parent | e5e69abd058b3fcfd484dbe1c632347332cda9b6 (diff) |
CIFS: Make use of common cifs_build_path_to_root for CIFS and SMB2
because the is no difference here. This also adds support of prefixpath
mount option for SMB2.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index a48387265cd4..5ce5686353f1 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -3261,8 +3261,10 @@ cifs_cleanup_volume_info(struct smb_vol *volume_info) | |||
3261 | 3261 | ||
3262 | 3262 | ||
3263 | #ifdef CONFIG_CIFS_DFS_UPCALL | 3263 | #ifdef CONFIG_CIFS_DFS_UPCALL |
3264 | /* build_path_to_root returns full path to root when | 3264 | /* |
3265 | * we do not have an exiting connection (tcon) */ | 3265 | * cifs_build_path_to_root returns full path to root when we do not have an |
3266 | * exiting connection (tcon) | ||
3267 | */ | ||
3266 | static char * | 3268 | static char * |
3267 | build_unc_path_to_root(const struct smb_vol *vol, | 3269 | build_unc_path_to_root(const struct smb_vol *vol, |
3268 | const struct cifs_sb_info *cifs_sb) | 3270 | const struct cifs_sb_info *cifs_sb) |
@@ -3518,8 +3520,10 @@ remote_path_check: | |||
3518 | rc = -ENOSYS; | 3520 | rc = -ENOSYS; |
3519 | goto mount_fail_check; | 3521 | goto mount_fail_check; |
3520 | } | 3522 | } |
3521 | /* build_path_to_root works only when we have a valid tcon */ | 3523 | /* |
3522 | full_path = build_path_to_root(volume_info, cifs_sb, tcon); | 3524 | * cifs_build_path_to_root works only when we have a valid tcon |
3525 | */ | ||
3526 | full_path = cifs_build_path_to_root(volume_info, cifs_sb, tcon); | ||
3523 | if (full_path == NULL) { | 3527 | if (full_path == NULL) { |
3524 | rc = -ENOMEM; | 3528 | rc = -ENOMEM; |
3525 | goto mount_fail_check; | 3529 | goto mount_fail_check; |