Commit 286170aa authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Move protocol specific negotiate code to ops struct 



Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent a891f0f8

fs/cifs/cifsglob.h

+6 −2
Original line number Diff line number Diff line
@@ -192,6 +192,10 @@ struct smb_version_operations { 
	/* process transaction2 response */

	bool (*check_trans2)(struct mid_q_entry *, struct TCP_Server_Info *,

			     char *, int);

	/* check if we need to negotiate */

	bool (*need_neg)(struct TCP_Server_Info *);

	/* negotiate to the server */

	int (*negotiate)(const unsigned int, struct cifs_ses *);

};



struct smb_version_values {
@@ -324,7 +328,7 @@ struct TCP_Server_Info { 
	struct mutex srv_mutex;

	struct task_struct *tsk;

	char server_GUID[16];

	char sec_mode;

	__u16 sec_mode;

	bool session_estab; /* mark when very first sess is established */

	u16 dialect; /* dialect index that server chose */

	enum securityEnum secType;
@@ -459,7 +463,7 @@ struct cifs_ses { 
	char *serverOS;		/* name of operating system underlying server */

	char *serverNOS;	/* name of network operating system of server */

	char *serverDomain;	/* security realm of server */

	int Suid;		/* remote smb uid  */

	__u64 Suid;		/* remote smb uid  */

	uid_t linux_uid;        /* overriding owner of files on the mount */

	uid_t cred_uid;		/* owner of credentials */

	int capabilities;

fs/cifs/cifsproto.h

+3 −3
Original line number Diff line number Diff line
@@ -178,11 +178,11 @@ extern void cifs_dfs_release_automount_timer(void); 
void cifs_proc_init(void);

void cifs_proc_clean(void);



extern int cifs_negotiate_protocol(unsigned int xid,

extern int cifs_negotiate_protocol(const unsigned int xid,

				   struct cifs_ses *ses);

extern int cifs_setup_session(unsigned int xid, struct cifs_ses *ses,

			struct nls_table *nls_info);

extern int CIFSSMBNegotiate(unsigned int xid, struct cifs_ses *ses);

extern int CIFSSMBNegotiate(const unsigned int xid, struct cifs_ses *ses);



extern int CIFSTCon(unsigned int xid, struct cifs_ses *ses,

			const char *tree, struct cifs_tcon *tcon,

fs/cifs/cifssmb.c

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static inline void inc_rfc1001_len(void *pSMB, int count) 
}



int

CIFSSMBNegotiate(unsigned int xid, struct cifs_ses *ses)

CIFSSMBNegotiate(const unsigned int xid, struct cifs_ses *ses)

{

	NEGOTIATE_REQ *pSMB;

	NEGOTIATE_RSP *pSMBr;
@@ -480,7 +480,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifs_ses *ses) 
			rc = -EOPNOTSUPP;

			goto neg_err_exit;

		}

		server->sec_mode = (__u8)le16_to_cpu(rsp->SecurityMode);

		server->sec_mode = le16_to_cpu(rsp->SecurityMode);

		server->maxReq = min_t(unsigned int,

				       le16_to_cpu(rsp->MaxMpxCount),

				       cifs_max_pending);

fs/cifs/connect.c

+11 −13
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ cifs_echo_request(struct work_struct *work) 
	 * done, which is indicated by maxBuf != 0. Also, no need to ping if

	 * we got a response recently

	 */

	if (server->maxBuf == 0 ||

	if (!server->ops->need_neg || server->ops->need_neg(server) ||

	    time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ))

		goto requeue_echo;
@@ -2406,7 +2406,8 @@ static bool warned_on_ntlm; /* globals init to false automatically */ 
static struct cifs_ses *

cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)

{

	int rc = -ENOMEM, xid;

	int rc = -ENOMEM;

	unsigned int xid;

	struct cifs_ses *ses;

	struct sockaddr_in *addr = (struct sockaddr_in *)&server->dstaddr;

	struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&server->dstaddr;
@@ -3960,24 +3961,22 @@ cifs_umount(struct cifs_sb_info *cifs_sb) 
	kfree(cifs_sb);

}



int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses)

int

cifs_negotiate_protocol(const unsigned int xid, struct cifs_ses *ses)

{

	int rc = 0;

	struct TCP_Server_Info *server = ses->server;



	if (!server->ops->need_neg || !server->ops->negotiate)

		return -ENOSYS;



	/* only send once per connect */

	if (server->maxBuf != 0)

	if (!server->ops->need_neg(server))

		return 0;



	set_credits(server, 1);

	rc = CIFSSMBNegotiate(xid, ses);

	if (rc == -EAGAIN) {

		/* retry only once on 1st time connection */

		set_credits(server, 1);

		rc = CIFSSMBNegotiate(xid, ses);

		if (rc == -EAGAIN)

			rc = -EHOSTDOWN;

	}



	rc = server->ops->negotiate(xid, ses);

	if (rc == 0) {

		spin_lock(&GlobalMid_Lock);

		if (server->tcpStatus == CifsNeedNegotiate)
@@ -3985,7 +3984,6 @@ int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses) 
		else

			rc = -EHOSTDOWN;

		spin_unlock(&GlobalMid_Lock);



	}



	return rc;

fs/cifs/sess.c

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ ssetup_ntlmssp_authenticate: 
	if (action & GUEST_LOGIN)

		cFYI(1, "Guest login"); /* BB mark SesInfo struct? */

	ses->Suid = smb_buf->Uid;   /* UID left in wire format (le) */

	cFYI(1, "UID = %d ", ses->Suid);

	cFYI(1, "UID = %llu ", ses->Suid);

	/* response can have either 3 or 4 word count - Samba sends 3 */

	/* and lanman response is 3 */

	bytes_remaining = get_bcc(smb_buf);