diff options
| author | Aurelien Aptel <aaptel@suse.com> | 2017-02-13 16:14:17 +0100 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2017-03-01 22:26:10 -0600 |
| commit | 268a635d414df45a4a8da699d431da8f8ffcf014 (patch) | |
| tree | 9812409d38f43381d1b2bcc001be965b7d202d43 /fs/cifs/cifs_dfs_ref.c | |
| parent | 4ecce920e13ace16a5ba45efe8909946c28fb2ad (diff) | |
| download | linux-rpi-268a635d414df45a4a8da699d431da8f8ffcf014.tar.gz linux-rpi-268a635d414df45a4a8da699d431da8f8ffcf014.tar.bz2 linux-rpi-268a635d414df45a4a8da699d431da8f8ffcf014.zip | |
CIFS: add build_path_from_dentry_optional_prefix()
this function does the same thing as add build_path_from_dentry() but
takes a boolean parameter to decide whether or not to prefix the path
with the tree name.
we cannot rely on tcon->Flags & SMB_SHARE_IS_IN_DFS for SMB2 as smb2
code never sets tcon->Flags but it sets tcon->share_flags and it seems
the SMB_SHARE_IS_IN_DFS has different semantics in SMB2: the prefix
shouldn't be added everytime it was in SMB1.
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifs_dfs_ref.c')
| -rw-r--r-- | fs/cifs/cifs_dfs_ref.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 9156be545b0f..6b61df117fd4 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c @@ -303,7 +303,9 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) * gives us the latter, so we must adjust the result. */ mnt = ERR_PTR(-ENOMEM); - full_path = build_path_from_dentry(mntpt); + + /* always use tree name prefix */ + full_path = build_path_from_dentry_optional_prefix(mntpt, true); if (full_path == NULL) goto cdda_exit; |