diff options
| author | Paulo Alcantara <pc@cjr.nz> | 2020-07-21 09:36:40 -0300 | 
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-08-02 18:00:26 -0500 | 
| commit | 7d397a034d5c45528c7bdf7fc3752c4793029cce (patch) | |
| tree | ecdb8b9f2b840626a6c130b23ca275b52a8b535d /fs/cifs | |
| parent | 2e5de42445217c7c1310af8f4b3fe6f66bd865b1 (diff) | |
| download | linux-7d397a034d5c45528c7bdf7fc3752c4793029cce.tar.bz2 | |
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: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/connect.c | 13 | 
1 files changed, 6 insertions, 7 deletions
| diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 727d676c7fb9..21a4685894fa 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -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, -				    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) { @@ -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) { |