Commit 8aa26f3e authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Pavel Shilovsky
Browse files

CIFS: Move protocol specific demultiplex thread calls to ops struct 



Acked-by: default avatarShirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent eb378711

fs/cifs/cifs_debug.c

+4 −2
Original line number Diff line number Diff line
@@ -57,19 +57,21 @@ cifs_dump_mem(char *label, void *data, int length) 
	}

}



#ifdef CONFIG_CIFS_DEBUG2

void cifs_dump_detail(void *buf)

{

#ifdef CONFIG_CIFS_DEBUG2

	struct smb_hdr *smb = (struct smb_hdr *)buf;



	cERROR(1, "Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d",

		  smb->Command, smb->Status.CifsError,

		  smb->Flags, smb->Flags2, smb->Mid, smb->Pid);

	cERROR(1, "smb buf %p len %d", smb, smbCalcSize(smb));

#endif /* CONFIG_CIFS_DEBUG2 */

}



void cifs_dump_mids(struct TCP_Server_Info *server)

{

#ifdef CONFIG_CIFS_DEBUG2

	struct list_head *tmp;

	struct mid_q_entry *mid_entry;
@@ -102,8 +104,8 @@ void cifs_dump_mids(struct TCP_Server_Info *server) 
		}

	}

	spin_unlock(&GlobalMid_Lock);

}

#endif /* CONFIG_CIFS_DEBUG2 */

}



#ifdef CONFIG_PROC_FS

static int cifs_debug_data_proc_show(struct seq_file *m, void *v)

fs/cifs/cifs_debug.h

+2 −2
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#define _H_CIFS_DEBUG



void cifs_dump_mem(char *label, void *data, int length);

#ifdef CONFIG_CIFS_DEBUG2

#define DBG2 2

void cifs_dump_detail(void *);

void cifs_dump_mids(struct TCP_Server_Info *);

#ifdef CONFIG_CIFS_DEBUG2

#define DBG2 2

#else

#define DBG2 0

#endif

fs/cifs/cifsglob.h

+6 −0
Original line number Diff line number Diff line
@@ -175,6 +175,12 @@ struct smb_version_operations { 
	unsigned int (*read_data_length)(char *);

	/* map smb to linux error */

	int (*map_error)(char *, bool);

	/* find mid corresponding to the response message */

	struct mid_q_entry * (*find_mid)(struct TCP_Server_Info *, char *);

	void (*dump_detail)(void *);

	/* verify the message */

	int (*check_message)(char *, unsigned int);

	bool (*is_oplock_break)(char *, struct TCP_Server_Info *);

};



struct smb_version_values {

fs/cifs/connect.c

+4 −23
Original line number Diff line number Diff line
@@ -783,25 +783,6 @@ is_smb_response(struct TCP_Server_Info *server, unsigned char type) 
	return false;

}



static struct mid_q_entry *

find_mid(struct TCP_Server_Info *server, char *buffer)

{

	struct smb_hdr *buf = (struct smb_hdr *)buffer;

	struct mid_q_entry *mid;



	spin_lock(&GlobalMid_Lock);

	list_for_each_entry(mid, &server->pending_mid_q, qhead) {

		if (mid->mid == buf->Mid &&

		    mid->mid_state == MID_REQUEST_SUBMITTED &&

		    le16_to_cpu(mid->command) == buf->Command) {

			spin_unlock(&GlobalMid_Lock);

			return mid;

		}

	}

	spin_unlock(&GlobalMid_Lock);

	return NULL;

}



void

dequeue_mid(struct mid_q_entry *mid, bool malformed)

{
@@ -986,7 +967,7 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid) 
	 * 48 bytes is enough to display the header and a little bit

	 * into the payload for debugging purposes.

	 */

	length = checkSMB(buf, server->total_read);

	length = server->ops->check_message(buf, server->total_read);

	if (length != 0)

		cifs_dump_mem("Bad SMB: ", buf,

			min_t(unsigned int, server->total_read, 48));
@@ -1059,7 +1040,7 @@ cifs_demultiplex_thread(void *p) 
			continue;

		server->total_read += length;



		mid_entry = find_mid(server, buf);

		mid_entry = server->ops->find_mid(server, buf);



		if (!mid_entry || !mid_entry->receive)

			length = standard_receive3(server, mid_entry);
@@ -1076,13 +1057,13 @@ cifs_demultiplex_thread(void *p) 
		if (mid_entry != NULL) {

			if (!mid_entry->multiRsp || mid_entry->multiEnd)

				mid_entry->callback(mid_entry);

		} else if (!is_valid_oplock_break(buf, server)) {

		} else if (!server->ops->is_oplock_break(buf, server)) {

			cERROR(1, "No task to wake, unknown frame received! "

				   "NumMids %d", atomic_read(&midCount));

			cifs_dump_mem("Received Data is: ", buf,

				      HEADER_SIZE(server));

#ifdef CONFIG_CIFS_DEBUG2

			cifs_dump_detail(buf);

			server->ops->dump_detail(buf);

			cifs_dump_mids(server);

#endif /* CIFS_DEBUG2 */

fs/cifs/smb1ops.c

+23 −0
Original line number Diff line number Diff line
@@ -81,6 +81,25 @@ cifs_read_data_length(char *buf) 
	       le16_to_cpu(rsp->DataLength);

}



static struct mid_q_entry *

cifs_find_mid(struct TCP_Server_Info *server, char *buffer)

{

	struct smb_hdr *buf = (struct smb_hdr *)buffer;

	struct mid_q_entry *mid;



	spin_lock(&GlobalMid_Lock);

	list_for_each_entry(mid, &server->pending_mid_q, qhead) {

		if (mid->mid == buf->Mid &&

		    mid->mid_state == MID_REQUEST_SUBMITTED &&

		    le16_to_cpu(mid->command) == buf->Command) {

			spin_unlock(&GlobalMid_Lock);

			return mid;

		}

	}

	spin_unlock(&GlobalMid_Lock);

	return NULL;

}



struct smb_version_operations smb1_operations = {

	.send_cancel = send_nt_cancel,

	.compare_fids = cifs_compare_fids,
@@ -89,6 +108,10 @@ struct smb_version_operations smb1_operations = { 
	.read_data_offset = cifs_read_data_offset,

	.read_data_length = cifs_read_data_length,

	.map_error = map_smb_to_linux_error,

	.find_mid = cifs_find_mid,

	.check_message = checkSMB,

	.dump_detail = cifs_dump_detail,

	.is_oplock_break = is_valid_oplock_break,

};



struct smb_version_values smb1_values = {