Commit 7d397a03 authored by Paulo Alcantara's avatar Paulo Alcantara Committed by Steve French
Browse files

cifs: rename reconn_inval_dfs_target() 



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: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 2e5de424

fs/cifs/connect.c

+6 −7
Original line number Diff line number Diff line
@@ -393,15 +393,14 @@ static inline int reconn_set_ipaddr(struct TCP_Server_Info *server) 


#ifdef CONFIG_CIFS_DFS_UPCALL

/* These functions must be called with server->srv_mutex held */

static void reconn_inval_dfs_target(struct TCP_Server_Info *server,

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) {
@@ -578,7 +577,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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE