diff options
Diffstat (limited to 'fs/smb/client/dfs.c')
| -rw-r--r-- | fs/smb/client/dfs.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/fs/smb/client/dfs.c b/fs/smb/client/dfs.c index 3ec965547e3d..4c9d5e0441bf 100644 --- a/fs/smb/client/dfs.c +++ b/fs/smb/client/dfs.c @@ -416,8 +416,7 @@ static void __tree_connect_ipc(const unsigned int xid, char *tree, scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$", server->hostname); cifs_server_unlock(server); - rc = server->ops->tree_connect(xid, ses, tree, tcon, - cifs_sb->local_nls); + rc = SMB2_tcon(xid, ses, tree, tcon, cifs_sb->local_nls); cifs_server_dbg(FYI, "%s: tree_reconnect %s: %d\n", __func__, tree, rc); spin_lock(&tcon->tc_lock); if (rc) { @@ -445,7 +444,6 @@ static int __tree_connect_dfs_target(const unsigned int xid, struct cifs_tcon *t { int rc; struct TCP_Server_Info *server = tcon->ses->server; - const struct smb_version_operations *ops = server->ops; struct cifs_ses *root_ses = CIFS_DFS_ROOT_SES(tcon->ses); char *share = NULL, *prefix = NULL; struct dfs_cache_tgt_iterator *tit; @@ -486,7 +484,7 @@ static int __tree_connect_dfs_target(const unsigned int xid, struct cifs_tcon *t scnprintf(tree, MAX_TREE_SIZE, "\\%s", share); if (!islink) { - rc = ops->tree_connect(xid, tcon->ses, tree, tcon, cifs_sb->local_nls); + rc = SMB2_tcon(xid, tcon->ses, tree, tcon, cifs_sb->local_nls); break; } @@ -498,7 +496,7 @@ static int __tree_connect_dfs_target(const unsigned int xid, struct cifs_tcon *t */ if (dfs_cache_find(xid, root_ses, cifs_sb->local_nls, cifs_remap(cifs_sb), target, NULL, &ntl)) { - rc = ops->tree_connect(xid, tcon->ses, tree, tcon, cifs_sb->local_nls); + rc = SMB2_tcon(xid, tcon->ses, tree, tcon, cifs_sb->local_nls); if (rc) continue; @@ -553,7 +551,6 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru { int rc; struct TCP_Server_Info *server = tcon->ses->server; - const struct smb_version_operations *ops = server->ops; DFS_CACHE_TGT_LIST(tl); struct cifs_sb_info *cifs_sb = NULL; struct super_block *sb = NULL; @@ -591,7 +588,7 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru cifs_server_lock(server); scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$", server->hostname); cifs_server_unlock(server); - rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc); + rc = SMB2_tcon(xid, tcon->ses, tree, tcon, nlsc); goto out; } @@ -605,8 +602,8 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru */ if (!cifs_sb || !server->leaf_fullpath || dfs_cache_noreq_find(server->leaf_fullpath + 1, &ref, &tl)) { - rc = ops->tree_connect(xid, tcon->ses, tcon->tree_name, tcon, - cifs_sb ? cifs_sb->local_nls : nlsc); + rc = SMB2_tcon(xid, tcon->ses, tcon->tree_name, tcon, + cifs_sb ? cifs_sb->local_nls : nlsc); goto out; } |