Commit 83b77391 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: Add smb2_send_recv 



This function is similar to SendReceive2 except it does not expect
a 4 byte rfc1002 length header in the first io vector.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 5b7d2796

fs/cifs/cifsproto.h

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, 
			struct kvec *, int /* nvec to send */,

			int * /* type of buf returned */, const int flags,

			struct kvec * /* resp vec */);

extern int smb2_send_recv(const unsigned int xid, struct cifs_ses *pses,

			  struct kvec *pkvec, int nvec_to_send,

			  int *pbuftype, const int flags,

			  struct kvec *presp);

extern int SendReceiveBlockingLock(const unsigned int xid,

			struct cifs_tcon *ptcon,

			struct smb_hdr *in_buf ,

fs/cifs/transport.c

+38 −0
Original line number Diff line number Diff line
@@ -827,6 +827,44 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
	return rc;

}



/* Like SendReceive2 but iov[0] does not contain an rfc1002 header */

int

smb2_send_recv(const unsigned int xid, struct cifs_ses *ses,

	       struct kvec *iov, int n_vec, int *resp_buf_type /* ret */,

	       const int flags, struct kvec *resp_iov)

{

	struct smb_rqst rqst;

	struct kvec *new_iov;

	int rc;

	int i;

	__u32 count;

	__be32 rfc1002_marker;



	new_iov = kmalloc(sizeof(struct kvec) * (n_vec + 1), GFP_KERNEL);

	if (!new_iov)

		return -ENOMEM;



	/* 1st iov is an RFC1002 Session Message length */

	memcpy(new_iov + 1, iov, (sizeof(struct kvec) * n_vec));



	count = 0;

	for (i = 1; i < n_vec + 1; i++)

		count += new_iov[i].iov_len;



	rfc1002_marker = cpu_to_be32(count);



	new_iov[0].iov_base = &rfc1002_marker;

	new_iov[0].iov_len = 4;



	memset(&rqst, 0, sizeof(struct smb_rqst));

	rqst.rq_iov = new_iov;

	rqst.rq_nvec = n_vec + 1;



	rc = cifs_send_recv(xid, ses, &rqst, resp_buf_type, flags, resp_iov);

	kfree(new_iov);

	return rc;

}



int

SendReceive(const unsigned int xid, struct cifs_ses *ses,

	    struct smb_hdr *in_buf, struct smb_hdr *out_buf,