| From 507345b5ae6a57b7ecd7550ff39282ed20de7b8d Mon Sep 17 00:00:00 2001 |
| From: Paulo Alcantara <pc@cjr.nz> |
| Date: Mon, 12 Jul 2021 12:38:24 -0300 |
| Subject: cifs: handle reconnect of tcon when there is no cached dfs referral |
| |
| From: Paulo Alcantara <pc@cjr.nz> |
| |
| commit 507345b5ae6a57b7ecd7550ff39282ed20de7b8d upstream. |
| |
| When there is no cached DFS referral of tcon->dfs_path, then reconnect |
| to same share. |
| |
| Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz> |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Steve French <stfrench@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/cifs/connect.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/fs/cifs/connect.c |
| +++ b/fs/cifs/connect.c |
| @@ -4185,7 +4185,8 @@ int cifs_tree_connect(const unsigned int |
| if (!tree) |
| return -ENOMEM; |
| |
| - if (!tcon->dfs_path) { |
| + /* If it is not dfs or there was no cached dfs referral, then reconnect to same share */ |
| + if (!tcon->dfs_path || dfs_cache_noreq_find(tcon->dfs_path + 1, &ref, &tl)) { |
| if (tcon->ipc) { |
| scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$", server->hostname); |
| rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc); |
| @@ -4195,9 +4196,6 @@ int cifs_tree_connect(const unsigned int |
| goto out; |
| } |
| |
| - rc = dfs_cache_noreq_find(tcon->dfs_path + 1, &ref, &tl); |
| - if (rc) |
| - goto out; |
| isroot = ref.server_type == DFS_TYPE_ROOT; |
| free_dfs_info_param(&ref); |
| |
