diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2016-09-06 14:22:34 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2016-10-12 19:08:32 +0200 |
| commit | d171356ff11ab1825e456dfb979755e01b3c54a1 (patch) | |
| tree | 1a14b2db140723082cce10d6a4ee462cb38559af /fs | |
| parent | fs/cifs: keep guid when assigning fid to fileinfo (diff) | |
| download | linux-d171356ff11ab1825e456dfb979755e01b3c54a1.tar.xz linux-d171356ff11ab1825e456dfb979755e01b3c54a1.zip | |
Fix regression which breaks DFS mounting
Patch a6b5058 results in -EREMOTE returned by is_path_accessible() in
cifs_mount() to be ignored which breaks DFS mounting.
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index c841244a954d..7b67179521cf 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3688,14 +3688,16 @@ remote_path_check: goto mount_fail_check; } - rc = cifs_are_all_path_components_accessible(server, + if (rc != -EREMOTE) { + rc = cifs_are_all_path_components_accessible(server, xid, tcon, cifs_sb, full_path); - if (rc != 0) { - cifs_dbg(VFS, "cannot query dirs between root and final path, " - "enabling CIFS_MOUNT_USE_PREFIX_PATH\n"); - cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_USE_PREFIX_PATH; - rc = 0; + if (rc != 0) { + cifs_dbg(VFS, "cannot query dirs between root and final path, " + "enabling CIFS_MOUNT_USE_PREFIX_PATH\n"); + cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_USE_PREFIX_PATH; + rc = 0; + } } kfree(full_path); } |