cifs: remove smb2_send_recv()

Now that we have the plumbing to pass request without an rfc1002
header all the way down to the point we write to the socket we no
longer need the smb2_send_recv() function.

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

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;
         struct cifs_ses *ses = tcon->ses;
@@ -2302,7 +2337,11 @@ SMB2_close_flags(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_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_close_rsp *)rsp_iov.iov_base;
 
@@ -2388,6 +2427,7 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
            u32 additional_info, size_t output_len, size_t min_len, void **data,
                 u32 *dlen)
 {
+        struct smb_rqst rqst;
         struct smb2_query_info_req *req;
         struct smb2_query_info_rsp *rsp = NULL;
         struct kvec iov[2];
@@ -2428,7 +2468,11 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
         /* 1 for Buffer */
         iov[0].iov_len = total_len - 1;
 
-        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_query_info_rsp *)rsp_iov.iov_base;
 
@@ -2630,6 +2674,7 @@ int
 SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
            u64 volatile_fid)
 {
+        struct smb_rqst rqst;
         struct smb2_flush_req *req;
         struct cifs_ses *ses = tcon->ses;
         struct kvec iov[1];
@@ -2657,7 +2702,11 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
         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);
 
         if (rc != 0) {
@@ -2918,6 +2967,7 @@ int
 SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
           unsigned int *nbytes, char **buf, int *buf_type)
 {
+        struct smb_rqst rqst;
         int resp_buftype, rc = -EACCES;
         struct smb2_read_plain_req *req = NULL;
         struct smb2_read_rsp *rsp = NULL;
@@ -2938,7 +2988,11 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
         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_read_rsp *)rsp_iov.iov_base;
@@ -3197,6 +3251,7 @@ int
 SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
            unsigned int *nbytes, struct kvec *iov, int n_vec)
 {
+        struct smb_rqst rqst;
         int rc = 0;
         struct smb2_write_req *req = NULL;
         struct smb2_write_rsp *rsp = NULL;
@@ -3238,7 +3293,11 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
         /* 1 for Buffer */
         iov[0].iov_len = total_len - 1;
 
-        rc = smb2_send_recv(xid, io_parms->tcon->ses, iov, n_vec + 1,
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = n_vec + 1;
+
+        rc = cifs_send_recv(xid, io_parms->tcon->ses, &rqst,
                             &resp_buftype, flags, &rsp_iov);
         cifs_small_buf_release(req);
         rsp = (struct smb2_write_rsp *)rsp_iov.iov_base;
@@ -3310,6 +3369,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
                      u64 persistent_fid, u64 volatile_fid, int index,
                      struct cifs_search_info *srch_inf)
 {
+        struct smb_rqst rqst;
         struct smb2_query_directory_req *req;
         struct smb2_query_directory_rsp *rsp = NULL;
         struct kvec iov[2];
@@ -3382,7 +3442,11 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
         iov[1].iov_base = (char *)(req->Buffer);
         iov[1].iov_len = len;
 
-        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_query_directory_rsp *)rsp_iov.iov_base;
 
@@ -3441,6 +3505,7 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
                u8 info_type, u32 additional_info, unsigned int num,
                 void **data, unsigned int *size)
 {
+        struct smb_rqst rqst;
         struct smb2_set_info_req *req;
         struct smb2_set_info_rsp *rsp = NULL;
         struct kvec *iov;
@@ -3496,7 +3561,11 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
                 iov[i].iov_len = size[i];
         }
 
-        rc = smb2_send_recv(xid, ses, iov, num, &resp_buftype, flags,
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = num;
+
+        rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
                             &rsp_iov);
         cifs_small_buf_release(req);
         rsp = (struct smb2_set_info_rsp *)rsp_iov.iov_base;
@@ -3651,6 +3720,7 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
                   const u64 persistent_fid, const u64 volatile_fid,
                   __u8 oplock_level)
 {
+        struct smb_rqst rqst;
         int rc;
         struct smb2_oplock_break *req = NULL;
         struct cifs_ses *ses = tcon->ses;
@@ -3679,7 +3749,11 @@ SMB2_oplock_break(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) {
@@ -3742,6 +3816,7 @@ int
 SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon,
               u64 persistent_fid, u64 volatile_fid, struct kstatfs *fsdata)
 {
+        struct smb_rqst rqst;
         struct smb2_query_info_rsp *rsp = NULL;
         struct kvec iov;
         struct kvec rsp_iov;
@@ -3760,7 +3835,11 @@ SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon,
         if (smb3_encryption_required(tcon))
                 flags |= CIFS_TRANSFORM_REQ;
 
-        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(iov.iov_base);
         if (rc) {
                 cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);
@@ -3785,6 +3864,7 @@ int
 SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,
               u64 persistent_fid, u64 volatile_fid, int level)
 {
+        struct smb_rqst rqst;
         struct smb2_query_info_rsp *rsp = NULL;
         struct kvec iov;
         struct kvec rsp_iov;
@@ -3816,7 +3896,11 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,
         if (smb3_encryption_required(tcon))
                 flags |= CIFS_TRANSFORM_REQ;
 
-        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(iov.iov_base);
         if (rc) {
                 cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);
@@ -3855,6 +3939,7 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
            const __u64 persist_fid, const __u64 volatile_fid, const __u32 pid,
            const __u32 num_lock, struct smb2_lock_element *buf)
 {
+        struct smb_rqst rqst;
         int rc = 0;
         struct smb2_lock_req *req = NULL;
         struct kvec iov[2];
@@ -3887,7 +3972,12 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
         iov[1].iov_len = count;
 
         cifs_stats_inc(&tcon->stats.cifs_stats.num_locks);
-        rc = smb2_send_recv(xid, tcon->ses, iov, 2, &resp_buf_type, flags,
+
+        memset(&rqst, 0, sizeof(struct smb_rqst));
+        rqst.rq_iov = iov;
+        rqst.rq_nvec = 2;
+
+        rc = cifs_send_recv(xid, tcon->ses, &rqst, &resp_buf_type, flags,
                             &rsp_iov);
         cifs_small_buf_release(req);
         if (rc) {
@@ -3921,6 +4011,7 @@ int
 SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
                  __u8 *lease_key, const __le32 lease_state)
 {
+        struct smb_rqst rqst;
         int rc;
         struct smb2_lease_ack *req = NULL;
         struct cifs_ses *ses = tcon->ses;
@@ -3951,7 +4042,11 @@ SMB2_lease_break(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) {
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 63f25f919b24..8b922ffc2345 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -880,23 +880,6 @@ 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;
-        int rc;
-
-        memset(&rqst, 0, sizeof(struct smb_rqst));
-        rqst.rq_iov = iov;
-        rqst.rq_nvec = n_vec;
-
-        rc = cifs_send_recv(xid, ses, &rqst, resp_buf_type, flags, resp_iov);
-        return rc;
-}
-
 int
 SendReceive(const unsigned int xid, struct cifs_ses *ses,
             struct smb_hdr *in_buf, struct smb_hdr *out_buf,