openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cifs: only update prefix path of DFS links in cifs_tree_connect() 

For DFS root mounts that contain a prefix path, do not change them
after failover.

E.g., if the user mounts

	//srvA/root/dir1

and then lost connection to srvA, it will reconnect to

	//srvB/root/dir1

In case of DFS links, which may resolve to different prefix paths
depending on their list of targets, the following must be supported:

	- mount //srvA/root/link/bar
	- connect to //srvA/share
	- set prefix path to "bar"
	- lost connection to srvA
	- reconnect to next target: //srvB/share/foo
	- set new prefix path to "foo/bar"

In cifs_tree_connect(), check the server_type field of the cached DFS
referral to determine whether or not prefix path should be updated.

Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Paulo Alcantara 2020-07-21 09:36:43 -03:00 committed by Steve French
parent c6a80e1ff4
commit 11375a59a9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/cifs/connect.c
View File

@ -5548,6 +5548,8 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru
const char *dfs_host; const char *dfs_host;
size_t dfs_host_len; size_t dfs_host_len;
char *share = NULL, *prefix = NULL; char *share = NULL, *prefix = NULL;
struct dfs_info3_param ref = {0};
bool isroot;
tree = kzalloc(MAX_TREE_SIZE, GFP_KERNEL); tree = kzalloc(MAX_TREE_SIZE, GFP_KERNEL);
if (!tree) if (!tree)
@ -5563,9 +5565,11 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru
goto out; goto out;
} }
rc = dfs_cache_noreq_find(tcon->dfs_path + 1, NULL, &tl); rc = dfs_cache_noreq_find(tcon->dfs_path + 1, &ref, &tl);
if (rc) if (rc)
goto out; goto out;
isroot = ref.server_type == DFS_TYPE_ROOT;
free_dfs_info_param(&ref);
extract_unc_hostname(server->hostname, &tcp_host, &tcp_host_len); extract_unc_hostname(server->hostname, &tcp_host, &tcp_host_len);
@ -5609,7 +5613,8 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru
} else { } else {
scnprintf(tree, MAX_TREE_SIZE, "\\%s", share); scnprintf(tree, MAX_TREE_SIZE, "\\%s", share);
rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc); rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc);
if (!rc) { /* Only handle prefix paths of DFS link targets */
if (!rc && !isroot) {
rc = update_super_prepath(tcon, prefix); rc = update_super_prepath(tcon, prefix);
break; break;
} }