Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 339134c1 authored by Paulo Alcantara (SUSE)'s avatar Paulo Alcantara (SUSE) Committed by Greg Kroah-Hartman
Browse files

cifs: Introduce helpers for finding TCP connection 



commit 345c1a4a9e09dc5842b7bbb6728a77910db69c52 upstream.

Add helpers for finding TCP connections that are good candidates for
being used by DFS refresh worker.

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>
Signed-off-by: default avatarRishabh Bhatnagar <risbhat@amazon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf8c7aa9

fs/cifs/dfs_cache.c

+31 −13
Original line number Original line Diff line number Diff line
@@ -1305,6 +1305,30 @@ static char *get_dfs_root(const char *path) 
	return npath;

	return npath;

}

}





static inline void put_tcp_server(struct TCP_Server_Info *server)

{

	cifs_put_tcp_session(server, 0);

}



static struct TCP_Server_Info *get_tcp_server(struct smb_vol *vol)

{

	struct TCP_Server_Info *server;



	server = cifs_find_tcp_session(vol);

	if (IS_ERR_OR_NULL(server))

		return NULL;



	spin_lock(&GlobalMid_Lock);

	if (server->tcpStatus != CifsGood) {

		spin_unlock(&GlobalMid_Lock);

		put_tcp_server(server);

		return NULL;

	}

	spin_unlock(&GlobalMid_Lock);



	return server;

}



/* Find root SMB session out of a DFS link path */

/* Find root SMB session out of a DFS link path */

static struct cifs_ses *find_root_ses(struct vol_info *vi,

static struct cifs_ses *find_root_ses(struct vol_info *vi,

				      struct cifs_tcon *tcon,

				      struct cifs_tcon *tcon,
@@ -1347,13 +1371,8 @@ static struct cifs_ses *find_root_ses(struct vol_info *vi, 
		goto out;

		goto out;

	}

	}





	server = cifs_find_tcp_session(&vol);

	server = get_tcp_server(&vol);

	if (IS_ERR_OR_NULL(server)) {

	if (!server) {

		ses = ERR_PTR(-EHOSTDOWN);

		goto out;

	}

	if (server->tcpStatus != CifsGood) {

		cifs_put_tcp_session(server, 0);

		ses = ERR_PTR(-EHOSTDOWN);

		ses = ERR_PTR(-EHOSTDOWN);

		goto out;

		goto out;

	}

	}
@@ -1451,19 +1470,18 @@ static void refresh_cache_worker(struct work_struct *work) 
	mutex_lock(&vol_lock);

	mutex_lock(&vol_lock);





	list_for_each_entry(vi, &vol_list, list) {

	list_for_each_entry(vi, &vol_list, list) {

		server = cifs_find_tcp_session(&vi->smb_vol);

		server = get_tcp_server(&vi->smb_vol);

		if (IS_ERR_OR_NULL(server))

		if (!server)

			continue;

			continue;

		if (server->tcpStatus != CifsGood)



			goto next;

		get_tcons(server, &list);

		get_tcons(server, &list);

		list_for_each_entry_safe(tcon, ntcon, &list, ulist) {

		list_for_each_entry_safe(tcon, ntcon, &list, ulist) {

			refresh_tcon(vi, tcon);

			refresh_tcon(vi, tcon);

			list_del_init(&tcon->ulist);

			list_del_init(&tcon->ulist);

			cifs_put_tcon(tcon);

			cifs_put_tcon(tcon);

		}

		}

next:



		cifs_put_tcp_session(server, 0);

		put_tcp_server(server);

	}

	}

	queue_delayed_work(dfscache_wq, &refresh_task, cache_ttl * HZ);

	queue_delayed_work(dfscache_wq, &refresh_task, cache_ttl * HZ);

	mutex_unlock(&vol_lock);

	mutex_unlock(&vol_lock);