[RFC PATCH 14/36] cifs: Remove cifs_io_subrequest::got_bytes
From: David Howells
Date: Tue May 19 2026 - 06:29:37 EST
Remove cifs_io_subrequest::got_bytes as smb->resp_data_len can be used
instead.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
cc: Steve French <sfrench@xxxxxxxxx>
cc: Paulo Alcantara <pc@xxxxxxxxxxxxx>
cc: Shyam Prasad N <sprasad@xxxxxxxxxxxxx>
cc: Tom Talpey <tom@xxxxxxxxxx>
cc: linux-cifs@xxxxxxxxxxxxxxx
cc: netfs@xxxxxxxxxxxxxxx
cc: linux-fsdevel@xxxxxxxxxxxxxxx
---
fs/smb/client/cifsglob.h | 1 -
fs/smb/client/cifssmb.c | 27 +++++++++++++--------------
fs/smb/client/smb2pdu.c | 22 ++++++++++------------
3 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 7187e304c42e..2cb858495bc1 100644
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -1467,7 +1467,6 @@ struct cifs_io_subrequest {
struct netfs_io_request *rreq;
struct cifs_io_request *req;
};
- ssize_t got_bytes;
unsigned int xid;
int result;
bool have_xid;
diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index 901f8aff6134..62f554f97a5c 100644
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -1450,7 +1450,7 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
__func__, smb->mid, smb->mid_state, rdata->result,
rdata->subreq.len);
- if (rdata->got_bytes)
+ if (smb->resp_data_len)
iov_iter_bvec_queue(&rqst.rq_iter, ITER_DEST,
rdata->subreq.content.bvecq, rdata->subreq.content.slot,
rdata->subreq.content.offset, rdata->subreq.len);
@@ -1458,9 +1458,8 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
switch (smb->mid_state) {
case MID_RESPONSE_RECEIVED:
/* result already set, check signature */
- rdata->got_bytes = smb->resp_data_len;
if (server->sign) {
- int rc = 0;
+ int rc;
iov_iter_truncate(&rqst.rq_iter, smb->resp_data_len);
rc = cifs_verify_signature(&rqst, server,
@@ -1470,8 +1469,8 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
rc);
}
/* FIXME: should this be counted toward the initiating task? */
- task_io_account_read(rdata->got_bytes);
- cifs_stats_bytes_read(tcon, rdata->got_bytes);
+ task_io_account_read(smb->resp_data_len);
+ cifs_stats_bytes_read(tcon, smb->resp_data_len);
break;
case MID_REQUEST_SUBMITTED:
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_req_submitted);
@@ -1481,12 +1480,12 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
do_retry:
__set_bit(NETFS_SREQ_NEED_RETRY, &rdata->subreq.flags);
rdata->result = -EAGAIN;
- if (server->sign && rdata->got_bytes)
+ if (server->sign && smb->resp_data_len)
/* reset bytes number since we can not check a sign */
- rdata->got_bytes = 0;
+ smb->resp_data_len = 0;
/* FIXME: should this be counted toward the initiating task? */
- task_io_account_read(rdata->got_bytes);
- cifs_stats_bytes_read(tcon, rdata->got_bytes);
+ task_io_account_read(smb->resp_data_len);
+ cifs_stats_bytes_read(tcon, smb->resp_data_len);
break;
case MID_RESPONSE_MALFORMED:
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_malformed);
@@ -1511,15 +1510,15 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
rdata->subreq.len - rdata->subreq.transferred,
rdata->result);
} else {
- size_t trans = rdata->subreq.transferred + rdata->got_bytes;
+ size_t trans = rdata->subreq.transferred + smb->resp_data_len;
if (trans < rdata->subreq.len &&
rdata->subreq.start + trans >= netfs_read_remote_i_size(inode)) {
rdata->result = 0;
__set_bit(NETFS_SREQ_HIT_EOF, &rdata->subreq.flags);
- } else if (rdata->got_bytes > 0) {
+ } else if (smb->resp_data_len > 0) {
__set_bit(NETFS_SREQ_MADE_PROGRESS, &rdata->subreq.flags);
}
- if (rdata->got_bytes)
+ if (smb->resp_data_len)
__set_bit(NETFS_SREQ_MADE_PROGRESS, &rdata->subreq.flags);
trace_smb3_read_done(rdata->rreq->debug_id,
rdata->subreq.debug_index,
@@ -1527,7 +1526,7 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
rdata->req->cfile->fid.persistent_fid,
tcon->tid, tcon->ses->Suid,
rdata->subreq.start + rdata->subreq.transferred,
- rdata->got_bytes);
+ smb->resp_data_len);
}
trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, rdata->credits.value,
@@ -1535,7 +1534,7 @@ cifs_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
0, cifs_trace_rw_credits_read_response_clear);
rdata->credits.value = 0;
rdata->subreq.error = rdata->result;
- rdata->subreq.transferred += rdata->got_bytes;
+ rdata->subreq.transferred += smb->resp_data_len;
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_progress);
netfs_read_subreq_terminated(&rdata->subreq);
release_mid(server, smb);
diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index ab193f84c1ab..ddf127dc27bb 100644
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -4671,10 +4671,9 @@ smb2_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_progress);
}
- rdata->got_bytes = smb->resp_data_len;
/* FIXME: should this be counted toward the initiating task? */
- task_io_account_read(rdata->got_bytes);
- cifs_stats_bytes_read(tcon, rdata->got_bytes);
+ task_io_account_read(smb->resp_data_len);
+ cifs_stats_bytes_read(tcon, smb->resp_data_len);
break;
case MID_REQUEST_SUBMITTED:
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_req_submitted);
@@ -4684,12 +4683,12 @@ smb2_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
do_retry:
__set_bit(NETFS_SREQ_NEED_RETRY, &rdata->subreq.flags);
rdata->result = -EAGAIN;
- if (server->sign && rdata->got_bytes)
+ if (server->sign && smb->resp_data_len)
/* reset bytes number since we can not check a sign */
- rdata->got_bytes = 0;
+ smb->resp_data_len = 0;
/* FIXME: should this be counted toward the initiating task? */
- task_io_account_read(rdata->got_bytes);
- cifs_stats_bytes_read(tcon, rdata->got_bytes);
+ task_io_account_read(smb->resp_data_len);
+ cifs_stats_bytes_read(tcon, smb->resp_data_len);
break;
case MID_RESPONSE_MALFORMED:
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_malformed);
@@ -4731,19 +4730,19 @@ smb2_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
rdata->req->cfile->fid.persistent_fid,
tcon->tid, tcon->ses->Suid,
rdata->subreq.start + rdata->subreq.transferred,
- rdata->got_bytes);
+ smb->resp_data_len);
if (rdata->result == -ENODATA) {
__set_bit(NETFS_SREQ_HIT_EOF, &rdata->subreq.flags);
rdata->result = 0;
} else {
- size_t trans = rdata->subreq.transferred + rdata->got_bytes;
+ size_t trans = rdata->subreq.transferred + smb->resp_data_len;
if (trans < rdata->subreq.len &&
rdata->subreq.start + trans >= netfs_read_remote_i_size(inode)) {
__set_bit(NETFS_SREQ_HIT_EOF, &rdata->subreq.flags);
rdata->result = 0;
}
- if (rdata->got_bytes)
+ if (smb->resp_data_len)
__set_bit(NETFS_SREQ_MADE_PROGRESS, &rdata->subreq.flags);
}
@@ -4759,7 +4758,7 @@ smb2_readv_callback(struct TCP_Server_Info *server, struct smb_message *smb)
0, cifs_trace_rw_credits_read_response_clear);
rdata->credits.value = 0;
rdata->subreq.error = rdata->result;
- rdata->subreq.transferred += rdata->got_bytes;
+ rdata->subreq.transferred += smb->resp_data_len;
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_progress);
netfs_read_subreq_terminated(&rdata->subreq);
release_mid(server, smb);
@@ -4814,7 +4813,6 @@ smb2_async_readv(struct cifs_io_subrequest *rdata)
rdata->iov[0].iov_base = buf;
rdata->iov[0].iov_len = total_len;
- rdata->got_bytes = 0;
rdata->result = 0;
shdr = (struct smb2_hdr *)buf;