Commit 6e406988 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.17-rc8-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fix from Steve French:
 "Small fix for regression in multiuser mounts.

  The additional improvements suggested by Ronnie to make the server and
  session status handling code easier to read can wait for the 5.18
  merge window."

* tag '5.17-rc8-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: fix incorrect session setup check for multiuser mounts
parents 6c4bcd81 e3ee9fb2

fs/cifs/connect.c

+2 −1
Original line number Diff line number Diff line
@@ -3924,7 +3924,8 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses, 


	/* only send once per connect */

	spin_lock(&cifs_tcp_ses_lock);

	if (server->tcpStatus != CifsNeedSessSetup) {

	if ((server->tcpStatus != CifsNeedSessSetup) &&

	    (ses->status == CifsGood)) {

		spin_unlock(&cifs_tcp_ses_lock);

		return 0;

	}