Commit ebe6aa5a authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: eliminate "first_time" parm to CIFS_SessSetup 



We can use the is_first_ses_reconnect() function to determine this.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent d54ff732

fs/cifs/cifsproto.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ extern int small_smb_init_no_tc(const int smb_cmd, const int wct, 
				struct cifsSesInfo *ses,

				void **request_buf);

extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,

			     const int stage,

			     const struct nls_table *nls_cp);

extern __u16 GetNextMid(struct TCP_Server_Info *server);

extern struct timespec cifs_NTtimeToUnix(__le64 utc_nanoseconds_since_1601);

fs/cifs/connect.c

+1 −3
Original line number Diff line number Diff line
@@ -2878,7 +2878,6 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, 
					   struct nls_table *nls_info)

{

	int rc = 0;

	int first_time = 0;

	struct TCP_Server_Info *server = pSesInfo->server;



	/* what if server changes its buffer size after dropping the session? */
@@ -2899,7 +2898,6 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, 
			spin_unlock(&GlobalMid_Lock);



		}

		first_time = 1;

	}



	if (rc)
@@ -2913,7 +2911,7 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, 
	cFYI(1, "Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d",

		 server->secMode, server->capabilities, server->timeAdj);



	rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info);

	rc = CIFS_SessSetup(xid, pSesInfo, nls_info);

	if (rc) {

		cERROR(1, "Send error in SessSetup = %d", rc);

	} else {

fs/cifs/sess.c

+14 −7
Original line number Diff line number Diff line
@@ -35,9 +35,11 @@ 
extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,

			 unsigned char *p24);



/* Checks if this is the first smb session to be reconnected after

   the socket has been reestablished (so we know whether to use vc 0).

   Called while holding the cifs_tcp_ses_lock, so do not block */

/*

 * Checks if this is the first smb session to be reconnected after

 * the socket has been reestablished (so we know whether to use vc 0).

 * Called while holding the cifs_tcp_ses_lock, so do not block

 */

static bool is_first_ses_reconnect(struct cifsSesInfo *ses)

{

	struct list_head *tmp;
@@ -447,7 +449,7 @@ static void build_ntlmssp_negotiate_blob(unsigned char *pbuffer, 
   This function returns the length of the data in the blob */

static int build_ntlmssp_auth_blob(unsigned char *pbuffer,

				   struct cifsSesInfo *ses,

				   const struct nls_table *nls_cp, int first)

				   const struct nls_table *nls_cp, bool first)

{

	AUTHENTICATE_MESSAGE *sec_blob = (AUTHENTICATE_MESSAGE *)pbuffer;

	__u32 flags;
@@ -546,7 +548,7 @@ static void setup_ntlmssp_neg_req(SESSION_SETUP_ANDX *pSMB, 


static int setup_ntlmssp_auth_req(SESSION_SETUP_ANDX *pSMB,

				  struct cifsSesInfo *ses,

				  const struct nls_table *nls, int first_time)

				  const struct nls_table *nls, bool first_time)

{

	int bloblen;
@@ -559,7 +561,7 @@ static int setup_ntlmssp_auth_req(SESSION_SETUP_ANDX *pSMB, 
#endif



int

CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,

CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,

	       const struct nls_table *nls_cp)

{

	int rc = 0;
@@ -577,10 +579,15 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, 
	int bytes_remaining;

	struct key *spnego_key = NULL;

	__le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */

	bool first_time;



	if (ses == NULL)

		return -EINVAL;



	read_lock(&cifs_tcp_ses_lock);

	first_time = is_first_ses_reconnect(ses);

	read_unlock(&cifs_tcp_ses_lock);



	type = ses->server->secType;



	cFYI(1, "sess setup type %d", type);