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

Commit 082d0642 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Pavel Shilovsky
Browse files

CIFS: Move protocol specific part from SendReceive2 to ops struct 



Acked-by: default avatarShirish Pargaonkar <shirishpargaonkar@gmail.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 2608bee7

fs/cifs/cifsglob.h

+7 −0
Original line number Diff line number Diff line
@@ -157,11 +157,18 @@ enum smb_version { 
struct mid_q_entry;

struct TCP_Server_Info;

struct cifsFileInfo;

struct cifs_ses;



struct smb_version_operations {

	int (*send_cancel)(struct TCP_Server_Info *, void *,

			   struct mid_q_entry *);

	bool (*compare_fids)(struct cifsFileInfo *, struct cifsFileInfo *);

	/* setup request: allocate mid, sign message */

	int (*setup_request)(struct cifs_ses *, struct kvec *, unsigned int,

			     struct mid_q_entry **);

	/* check response: verify signature, map error */

	int (*check_receive)(struct mid_q_entry *, struct TCP_Server_Info *,

			     bool);

};



struct smb_version_values {

fs/cifs/cifsproto.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ extern int SendReceive(const unsigned int /* xid */ , struct cifs_ses *, 
			int * /* bytes returned */ , const int long_op);

extern int SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses,

			    char *in_buf, int flags);

extern int cifs_setup_request(struct cifs_ses *, struct kvec *, unsigned int,

			      struct mid_q_entry **);

extern int cifs_check_receive(struct mid_q_entry *mid,

			struct TCP_Server_Info *server, bool log_error);

extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *,

fs/cifs/smb1ops.c

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ cifs_compare_fids(struct cifsFileInfo *ob1, struct cifsFileInfo *ob2) 
struct smb_version_operations smb1_operations = {

	.send_cancel = send_nt_cancel,

	.compare_fids = cifs_compare_fids,

	.setup_request = cifs_setup_request,

	.check_receive = cifs_check_receive,

};



struct smb_version_values smb1_values = {

fs/cifs/transport.c

+4 −3
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server, 
	return map_smb_to_linux_error(mid->resp_buf, log_error);

}



static int

int

cifs_setup_request(struct cifs_ses *ses, struct kvec *iov,

		   unsigned int nvec, struct mid_q_entry **ret_mid)

{
@@ -577,7 +577,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 


	mutex_lock(&ses->server->srv_mutex);



	rc = cifs_setup_request(ses, iov, n_vec, &midQ);

	rc = ses->server->ops->setup_request(ses, iov, n_vec, &midQ);

	if (rc) {

		mutex_unlock(&ses->server->srv_mutex);

		cifs_small_buf_release(buf);
@@ -640,7 +640,8 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
	else

		*pRespBufType = CIFS_SMALL_BUFFER;



	rc = cifs_check_receive(midQ, ses->server, flags & CIFS_LOG_ERROR);

	rc = ses->server->ops->check_receive(midQ, ses->server,

					     flags & CIFS_LOG_ERROR);



	/* mark it so buf will not be freed by delete_mid */

	if ((flags & CIFS_NO_RESP) == 0)