diff mbox series

[1/4] cifs: rename reconn_inval_dfs_target()

Message ID 20210527144915.17079-2-tim.gardner@canonical.com
State New
Headers show
Series cifs: On cifs_reconnect, resolve the hostname again | expand

Commit Message

Tim Gardner May 27, 2021, 2:49 p.m. UTC 
From: Paulo Alcantara <pc@cjr.nz>

BugLink: https://bugs.launchpad.net/bugs/1929831

This function has nothing to do with *invalidation* but setting up the
next target server from a cached referral.

Rename it to reconn_set_next_dfs_target().  While at it, get rid of
some meaningless checks.

Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
(backported from commit 7d397a034d5c45528c7bdf7fc3752c4793029cce)
[rtg minor context adjustmnent]
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 fs/cifs/connect.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index ab9eeb5ff8e57..1746aadf85ef4 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -435,15 +435,14 @@  static inline void put_tcp_super(struct super_block *sb)
 		cifs_sb_deactive(sb);
 }
 
-static void reconn_inval_dfs_target(struct TCP_Server_Info *server,
-				    struct cifs_sb_info *cifs_sb,
-				    struct dfs_cache_tgt_list *tgt_list,
-				    struct dfs_cache_tgt_iterator **tgt_it)
+static void reconn_set_next_dfs_target(struct TCP_Server_Info *server,
+				       struct cifs_sb_info *cifs_sb,
+				       struct dfs_cache_tgt_list *tgt_list,
+				       struct dfs_cache_tgt_iterator **tgt_it)
 {
 	const char *name;
 
-	if (!cifs_sb || !cifs_sb->origin_fullpath || !tgt_list ||
-	    !server->nr_targets)
+	if (!cifs_sb || !cifs_sb->origin_fullpath)
 		return;
 
 	if (!*tgt_it) {
@@ -620,7 +619,7 @@  cifs_reconnect(struct TCP_Server_Info *server)
 		 * feature is disabled, then we will retry last server we
 		 * connected to before.
 		 */
-		reconn_inval_dfs_target(server, cifs_sb, &tgt_list, &tgt_it);
+		reconn_set_next_dfs_target(server, cifs_sb, &tgt_list, &tgt_it);
 #endif
 		rc = reconn_set_ipaddr(server);
 		if (rc) {