Skip to content

Commit b608e2c

Browse files
metze-sambasmfrench
authored andcommitted
smb/client: remove unused rq_iter_size from struct smb_rqst
Reviewed-by: David Howells <[email protected]> Fixes: d08089f ("cifs: Change the I/O paths to use an iterator rather than a page list") Signed-off-by: Stefan Metzmacher <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent c724b2a commit b608e2c

File tree

4 files changed

+0
-6
lines changed

4 files changed

+0
-6
lines changed

fs/smb/client/cifsglob.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ struct cifs_open_info_data {
254254
struct smb_rqst {
255255
struct kvec *rq_iov; /* array of kvecs */
256256
unsigned int rq_nvec; /* number of kvecs in array */
257-
size_t rq_iter_size; /* Amount of data in ->rq_iter */
258257
struct iov_iter rq_iter; /* Data iterator */
259258
struct xarray rq_buffer; /* Page buffer for encryption */
260259
};

fs/smb/client/cifssmb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,6 @@ cifs_async_writev(struct cifs_io_subrequest *wdata)
17131713
rqst.rq_iov = iov;
17141714
rqst.rq_nvec = 2;
17151715
rqst.rq_iter = wdata->subreq.io_iter;
1716-
rqst.rq_iter_size = iov_iter_count(&wdata->subreq.io_iter);
17171716

17181717
cifs_dbg(FYI, "async write at %llu %zu bytes\n",
17191718
wdata->subreq.start, wdata->subreq.len);

fs/smb/client/smb2ops.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4446,7 +4446,6 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
44464446
}
44474447
iov_iter_xarray(&new->rq_iter, ITER_SOURCE,
44484448
buffer, 0, size);
4449-
new->rq_iter_size = size;
44504449
}
44514450
}
44524451

@@ -4492,7 +4491,6 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
44924491
rqst.rq_nvec = 2;
44934492
if (iter) {
44944493
rqst.rq_iter = *iter;
4495-
rqst.rq_iter_size = iov_iter_count(iter);
44964494
iter_size = iov_iter_count(iter);
44974495
}
44984496

fs/smb/client/smb2pdu.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4523,7 +4523,6 @@ smb2_readv_callback(struct mid_q_entry *mid)
45234523

45244524
if (rdata->got_bytes) {
45254525
rqst.rq_iter = rdata->subreq.io_iter;
4526-
rqst.rq_iter_size = iov_iter_count(&rdata->subreq.io_iter);
45274526
}
45284527

45294528
WARN_ONCE(rdata->server != mid->server,
@@ -4975,7 +4974,6 @@ smb2_async_writev(struct cifs_io_subrequest *wdata)
49754974
rqst.rq_iov = iov;
49764975
rqst.rq_nvec = 1;
49774976
rqst.rq_iter = wdata->subreq.io_iter;
4978-
rqst.rq_iter_size = iov_iter_count(&rqst.rq_iter);
49794977
if (test_bit(NETFS_SREQ_RETRYING, &wdata->subreq.flags))
49804978
smb2_set_replay(server, &rqst);
49814979
#ifdef CONFIG_CIFS_SMB_DIRECT

0 commit comments

Comments
 (0)