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

Commit 35028d71 authored by Steve French's avatar Steve French
Browse files

[CIFS] Fix looping on reconnect to Samba when unexpected tree connect fail on reconnect 



Signed-off-by: default avatarShirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 932e2d23

fs/cifs/cifssmb.c

+18 −14
Original line number Diff line number Diff line
@@ -165,17 +165,19 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon, 
				rc = CIFSTCon(0, tcon->ses, tcon->treeName,

					      tcon, nls_codepage);

				up(&tcon->ses->sesSem);

				/* tell server which Unix caps we support */

				if (tcon->ses->capabilities & CAP_UNIX)

					reset_cifs_unix_caps(0 /* no xid */,

						tcon,

						NULL /* we do not know sb */,

						NULL /* no vol info */);

				/* BB FIXME add code to check if wsize needs

				   update due to negotiated smb buffer size

				   shrinking */

				if (rc == 0)

				if (rc == 0) {

					atomic_inc(&tconInfoReconnectCount);

					/* tell server Unix caps we support */

					if (tcon->ses->capabilities & CAP_UNIX)

						reset_cifs_unix_caps(

						0 /* no xid */,

						tcon,

						NULL /* we do not know sb */,

						NULL /* no vol info */);

				}



				cFYI(1, ("reconnect tcon rc = %d", rc));

				/* Removed call to reopen open files here.
@@ -310,17 +312,19 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon, 
				rc = CIFSTCon(0, tcon->ses, tcon->treeName,

					      tcon, nls_codepage);

				up(&tcon->ses->sesSem);

				/* tell server which Unix caps we support */

				if (tcon->ses->capabilities & CAP_UNIX)

					reset_cifs_unix_caps(0 /* no xid */,

						tcon,

						NULL /* do not know sb */,

						NULL /* no vol info */);

				/* BB FIXME add code to check if wsize needs

				update due to negotiated smb buffer size

				shrinking */

				if (rc == 0)

				if (rc == 0) {

					atomic_inc(&tconInfoReconnectCount);

					/* tell server Unix caps we support */

					if (tcon->ses->capabilities & CAP_UNIX)

						reset_cifs_unix_caps(

						0 /* no xid */,

						tcon,

						NULL /* do not know sb */,

						NULL /* no vol info */);

				}



				cFYI(1, ("reconnect tcon rc = %d", rc));

				/* Removed call to reopen open files here.