3 files changed, 116 insertions, 42 deletions

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 4f9218281ff3..03018be17283 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -112,10 +112,6 @@ 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 ,
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index c48608c5a0fb..7daf38ab814a 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -602,6 +602,7 @@ static void assemble_neg_contexts(struct smb2_negotiate_req *req,
 int
 SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
 {
+        struct smb_rqst rqst;
         struct smb2_negotiate_req *req;
         struct smb2_negotiate_rsp *rsp;
         struct kvec iov[1];
@@ -673,7 +674,11 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
         iov[0].iov_base = (char *)req;
         iov[0].iov_len = total_len;
 
-        rc = smb2_send_recv(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = 1;
+
+        rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
         cifs_small_buf_release(req);
         rsp = (struct smb2_negotiate_rsp *)rsp_iov.iov_base;
         /*
@@ -1028,6 +1033,7 @@ static int
 SMB2_sess_sendreceive(struct SMB2_sess_data *sess_data)
 {
         int rc;
+        struct smb_rqst rqst;
         struct smb2_sess_setup_req *req = sess_data->iov[0].iov_base;
         struct kvec rsp_iov = { NULL, 0 };
 
@@ -1036,10 +1042,13 @@ SMB2_sess_sendreceive(struct SMB2_sess_data *sess_data)
                 cpu_to_le16(sizeof(struct smb2_sess_setup_req) - 1 /* pad */);
         req->SecurityBufferLength = cpu_to_le16(sess_data->iov[1].iov_len);
 
-        /* BB add code to build os and lm fields */
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = sess_data->iov;
+        rqst.rq_nvec = 2;
 
-        rc = smb2_send_recv(sess_data->xid, sess_data->ses,
-                            sess_data->iov, 2,
+        /* BB add code to build os and lm fields */
+        rc = cifs_send_recv(sess_data->xid, sess_data->ses,
+                            &rqst,
                             &sess_data->buf0_type,
                             CIFS_LOG_ERROR | CIFS_NEG_OP, &rsp_iov);
         cifs_small_buf_release(sess_data->iov[0].iov_base);
@@ -1377,6 +1386,7 @@ out:
 int
 SMB2_logoff(const unsigned int xid, struct cifs_ses *ses)
 {
+        struct smb_rqst rqst;
         struct smb2_logoff_req *req; /* response is also trivial struct */
         int rc = 0;
         struct TCP_Server_Info *server;
@@ -1414,7 +1424,11 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses *ses)
         iov[0].iov_base = (char *)req;
         iov[0].iov_len = total_len;
 
-        rc = smb2_send_recv(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = 1;
+
+        rc = cifs_send_recv(xid, ses, &rqst, &resp_buf_type, flags, &rsp_iov);
         cifs_small_buf_release(req);
         /*
          * No tcon so can't do
@@ -1444,6 +1458,7 @@ int
 SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
           struct cifs_tcon *tcon, const struct nls_table *cp)
 {
+        struct smb_rqst rqst;
         struct smb2_tree_connect_req *req;
         struct smb2_tree_connect_rsp *rsp = NULL;
         struct kvec iov[2];
@@ -1500,7 +1515,11 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
             !smb3_encryption_required(tcon))
                 req->sync_hdr.Flags |= SMB2_FLAGS_SIGNED;
 
-        rc = smb2_send_recv(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov);
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = 2;
+
+        rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags, &rsp_iov);
         cifs_small_buf_release(req);
         rsp = (struct smb2_tree_connect_rsp *)rsp_iov.iov_base;
 
@@ -1564,6 +1583,7 @@ tcon_error_exit:
 int
 SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)
 {
+        struct smb_rqst rqst;
         struct smb2_tree_disconnect_req *req; /* response is trivial */
         int rc = 0;
         struct cifs_ses *ses = tcon->ses;
@@ -1594,7 +1614,11 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)
         iov[0].iov_base = (char *)req;
         iov[0].iov_len = total_len;
 
-        rc = smb2_send_recv(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = 1;
+
+        rc = cifs_send_recv(xid, ses, &rqst, &resp_buf_type, flags, &rsp_iov);
         cifs_small_buf_release(req);
         if (rc)
                 cifs_stats_fail_inc(tcon, SMB2_TREE_DISCONNECT_HE);
@@ -1892,6 +1916,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
           __u8 *oplock, struct smb2_file_all_info *buf,
           struct kvec *err_iov, int *buftype)
 {
+        struct smb_rqst rqst;
         struct smb2_create_req *req;
         struct smb2_create_rsp *rsp;
         struct TCP_Server_Info *server;
@@ -2044,7 +2069,11 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
         }
 #endif /* SMB311 */
 
-        rc = smb2_send_recv(xid, ses, iov, n_iov, &resp_buftype, flags,
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = n_iov;
+
+        rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
                             &rsp_iov);
         cifs_small_buf_release(req);
         rsp = (struct smb2_create_rsp *)rsp_iov.iov_base;
@@ -2100,6 +2129,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
            char *in_data, u32 indatalen,
            char **out_data, u32 *plen /* returned data len */)
 {
+        struct smb_rqst rqst;
         struct smb2_ioctl_req *req;
         struct smb2_ioctl_rsp *rsp;
         struct cifs_ses *ses;
@@ -2190,7 +2220,11 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
         if (opcode == FSCTL_VALIDATE_NEGOTIATE_INFO)
                 req->sync_hdr.Flags |= SMB2_FLAGS_SIGNED;
 
-        rc = smb2_send_recv(xid, ses, iov, n_iov, &resp_buftype, flags,
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = n_iov;
+
+        rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
                             &rsp_iov);
         cifs_small_buf_release(req);
         rsp = (struct smb2_ioctl_rsp *)rsp_iov.iov_base;
@@ -2275,6 +2309,7 @@ int
 SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
                  u64 persistent_fid, u64 volatile_fid, int flags)
 {
+        struct smb_rqst rqst;
         struct smb2_close_req *req;
         struct smb2_close_rsp *rsp;