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

cifs: force new session setup and tcon for dfs 



Do not reuse existing sessions and tcons in DFS failover as it might
connect to different servers and shares.

Signed-off-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 00c796ee

fs/cifs/connect.c

+8 −5
Original line number Diff line number Diff line
@@ -453,9 +453,7 @@ static int reconnect_target_unlocked(struct TCP_Server_Info *server, struct dfs_ 
	return rc;

}



static int

reconnect_dfs_server(struct TCP_Server_Info *server,

		     bool mark_smb_session)

static int reconnect_dfs_server(struct TCP_Server_Info *server)

{

	int rc = 0;

	const char *refpath = server->current_fullpath + 1;
@@ -479,7 +477,12 @@ reconnect_dfs_server(struct TCP_Server_Info *server, 
	if (!cifs_tcp_ses_needs_reconnect(server, num_targets))

		return 0;



	cifs_mark_tcp_ses_conns_for_reconnect(server, mark_smb_session);

	/*

	 * Unconditionally mark all sessions & tcons for reconnect as we might be connecting to a

	 * different server or share during failover.  It could be improved by adding some logic to

	 * only do that in case it connects to a different server or share, though.

	 */

	cifs_mark_tcp_ses_conns_for_reconnect(server, true);



	cifs_abort_connection(server);
@@ -537,7 +540,7 @@ int cifs_reconnect(struct TCP_Server_Info *server, bool mark_smb_session) 
	}

	spin_unlock(&cifs_tcp_ses_lock);



	return reconnect_dfs_server(server, mark_smb_session);

	return reconnect_dfs_server(server);

}

#else

int cifs_reconnect(struct TCP_Server_Info *server, bool mark_smb_session)