[PATCH v4 06/11] cifs: Make smb1's SendReceive() wrap cifs_send_recv()

David Howells
2025-11-24T12:43:34Z

Make the smb1 transport's SendReceive() simply wrap cifs_send_recv() as
does SendReceive2(). This will then allow that to pick up the transport
changes there.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Steve French <sfrench@samba.org>
cc: Paulo Alcantara <pc@manguebit.org>
cc: Shyam Prasad N <sprasad@microsoft.com>
cc: Tom Talpey <tom@talpey.com>
cc: linux-cifs@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
---
fs/smb/client/cifstransport.c | 83 +++++------------------------------
1 file changed, 10 insertions(+), 73 deletions(-)

diff --git a/fs/smb/client/cifstransport.c b/fs/smb/client/cifstransport.c
index d67b256a2ee7..1a0b80fc97d4 100644
--- a/fs/smb/client/cifstransport.c
+++ b/fs/smb/client/cifstransport.c
@@ -237,12 +237,12 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
struct smb_hdr *in_buf, unsigned int in_len,
struct smb_hdr *out_buf, int *pbytes_returned, const int flags)
{
- int rc = 0;
- struct smb_message *smb;
+ struct TCP_Server_Info *server;
+ struct kvec resp_iov = {};
struct kvec iov = { .iov_base = in_buf, .iov_len = in_len };
struct smb_rqst rqst = { .rq_iov = &iov, .rq_nvec = 1 };
- struct cifs_credits credits = { .value = 1, .instance = 0 };
- struct TCP_Server_Info *server;
+ int resp_buf_type;
+ int rc = 0;

if (WARN_ON_ONCE(in_len > 0xffffff))
return -EIO;
@@ -273,78 +273,15 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses,
return -EIO;
}

- rc = wait_for_free_request(server, flags, &credits.instance);
- if (rc)
- return rc;
-
- /* make sure that we sign in the same order that we send on this socket
- and avoid races inside tcp sendmsg code that could cause corruption
- of smb data */
-
- cifs_server_lock(server);
-
- rc = allocate_mid(ses, in_buf, &smb);
- if (rc) {
- cifs_server_unlock(server);
- /* Update # of requests on wire to server */
- add_credits(server, &credits, 0);
- return rc;
- }
-
- rc = cifs_sign_smb(in_buf, in_len, server, &smb->sequence_number);
- if (rc) {
- cifs_server_unlock(server);
- goto out;
- }
-
- smb->mid_state = MID_REQUEST_SUBMITTED;
-
- rc = smb_send(server, in_buf, in_len);
- cifs_save_when_sent(smb);
-
- if (rc < 0)
- server->sequence_number -= 2;
-
- cifs_server_unlock(server);
-
+ rc = cifs_send_recv(xid, ses, ses->server,
+ &rqst, &resp_buf_type, flags, &resp_iov);
if (rc < 0)
- goto out;
-
- rc = wait_for_response(server, smb);
- if (rc != 0) {
- send_cancel(server, &rqst, smb);
- spin_lock(&smb->mid_lock);
- if (smb->mid_state == MID_REQUEST_SUBMITTED ||
- smb->mid_state == MID_RESPONSE_RECEIVED) {
- /* no longer considered to be "in-flight" */
- smb->callback = release_mid;
- spin_unlock(&smb->mid_lock);
- add_credits(server, &credits, 0);
- return rc;
- }
- spin_unlock(&smb->mid_lock);
- }
-
- rc = cifs_sync_mid_result(smb, server);
- if (rc != 0) {
- add_credits(server, &credits, 0);
return rc;
- }
-
- if (!smb->resp_buf || !out_buf ||
- smb->mid_state != MID_RESPONSE_READY) {
- rc = -EIO;
- cifs_server_dbg(VFS, "Bad MID state?\n");
- goto out;
- }
-
- *pbytes_returned = smb->response_pdu_len;
- memcpy(out_buf, smb->resp_buf, *pbytes_returned);
- rc = cifs_check_receive(smb, server, 0);
-out:
- delete_mid(smb);
- add_credits(server, &credits, 0);

+ *pbytes_returned = resp_iov.iov_len;
+ if (resp_iov.iov_len)
+ memcpy(out_buf, resp_iov.iov_base, resp_iov.iov_len);
+ free_rsp_buf(resp_buf_type, resp_iov.iov_base);
return rc;
}