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

Commit 45740847 authored by Pavel Shilovsky's avatar Pavel Shilovsky
Browse files

CIFS: Setup async request in ops struct 



Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 25e26632

fs/cifs/cifsglob.h

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ struct smb_version_operations { 
	/* setup request: allocate mid, sign message */

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

			     struct mid_q_entry **);

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

	int (*setup_async_request)(struct TCP_Server_Info *, 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);

fs/cifs/cifsproto.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ 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_setup_async_request(struct TCP_Server_Info *, 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

+1 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ struct smb_version_operations smb1_operations = { 
	.send_cancel = send_nt_cancel,

	.compare_fids = cifs_compare_fids,

	.setup_request = cifs_setup_request,

	.setup_async_request = cifs_setup_async_request,

	.check_receive = cifs_check_receive,

	.add_credits = cifs_add_credits,

	.set_credits = cifs_set_credits,

fs/cifs/transport.c

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ) 
	return 0;

}



static int

int

cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov,

			 unsigned int nvec, struct mid_q_entry **ret_mid)

{
@@ -391,7 +391,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, 
		return rc;



	mutex_lock(&server->srv_mutex);

	rc = cifs_setup_async_request(server, iov, nvec, &mid);

	rc = server->ops->setup_async_request(server, iov, nvec, &mid);

	if (rc) {

		mutex_unlock(&server->srv_mutex);

		add_credits(server, 1, optype);