Commit c6e02eef authored by Shyam Prasad N's avatar Shyam Prasad N Committed by Steve French
Browse files

cifs: change tcon status when need_reconnect is set on it 



When a tcon is marked for need_reconnect, the intention
is to have it reconnected.

This change adjusts tcon->status in cifs_tree_connect
when need_reconnect is set. Also, this change has a minor
correction in resetting need_reconnect on success. It makes
sure that it is done with tc_lock held.

Signed-off-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 55c7788c

fs/smb/client/connect.c

+5 −0
Original line number Diff line number Diff line
@@ -4228,6 +4228,11 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru 


	/* only send once per connect */

	spin_lock(&tcon->tc_lock);



	/* if tcon is marked for needing reconnect, update state */

	if (tcon->need_reconnect)

		tcon->status = TID_NEED_TCON;



	if (tcon->status == TID_GOOD) {

		spin_unlock(&tcon->tc_lock);

		return 0;

fs/smb/client/dfs.c

+6 −1
Original line number Diff line number Diff line
@@ -565,6 +565,11 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru 


	/* only send once per connect */

	spin_lock(&tcon->tc_lock);



	/* if tcon is marked for needing reconnect, update state */

	if (tcon->need_reconnect)

		tcon->status = TID_NEED_TCON;



	if (tcon->status == TID_GOOD) {

		spin_unlock(&tcon->tc_lock);

		return 0;
@@ -625,8 +630,8 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru 
		spin_lock(&tcon->tc_lock);

		if (tcon->status == TID_IN_TCON)

			tcon->status = TID_GOOD;

		spin_unlock(&tcon->tc_lock);

		tcon->need_reconnect = false;

		spin_unlock(&tcon->tc_lock);

	}



	return rc;

fs/smb/client/file.c

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon) 


	/* only send once per connect */

	spin_lock(&tcon->tc_lock);

	if (tcon->need_reconnect)

		tcon->status = TID_NEED_RECON;



	if (tcon->status != TID_NEED_RECON) {

		spin_unlock(&tcon->tc_lock);

		return;