smb/client: remove unused rq_iter_size from struct smb_rqst

Reviewed-by: David Howells <dhowells@redhat.com>
Fixes: d08089f649a0 ("cifs: Change the I/O paths to use an iterator rather than a page list")
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 7ebe80a25d045765668165bb3bc8347d914e8174..f379b9dc93bac1a8efcb30c7d7905d86d92ae29a 100644 (file)
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -254,7 +254,6 @@ struct cifs_open_info_data {
 struct smb_rqst {
        struct kvec     *rq_iov;        /* array of kvecs */
        unsigned int    rq_nvec;        /* number of kvecs in array */
-       size_t          rq_iter_size;   /* Amount of data in ->rq_iter */
        struct iov_iter rq_iter;        /* Data iterator */
        struct xarray   rq_buffer;      /* Page buffer for encryption */
 };

diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index 595c4b673707e9cb5c6b9259b04d0606fe20f3d8..6dce70f1720826012888112474f572ecde60a331 100644 (file)
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -1713,7 +1713,6 @@ cifs_async_writev(struct cifs_io_subrequest *wdata)
        rqst.rq_iov = iov;
        rqst.rq_nvec = 2;
        rqst.rq_iter = wdata->subreq.io_iter;
-       rqst.rq_iter_size = iov_iter_count(&wdata->subreq.io_iter);
 
        cifs_dbg(FYI, "async write at %llu %zu bytes\n",
                 wdata->subreq.start, wdata->subreq.len);

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 322cabc69c6f1490f0d89bb884e61910efb8f39b..ea298456d841ffee91bb6f4573fc413de0f98f98 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -4446,7 +4446,6 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, int num_rqst,
                        }
                        iov_iter_xarray(&new->rq_iter, ITER_SOURCE,
                                        buffer, 0, size);
-                       new->rq_iter_size = size;
                }
        }
 
@@ -4492,7 +4491,6 @@ decrypt_raw_data(struct TCP_Server_Info *server, char *buf,
        rqst.rq_nvec = 2;
        if (iter) {
                rqst.rq_iter = *iter;
-               rqst.rq_iter_size = iov_iter_count(iter);
                iter_size = iov_iter_count(iter);
        }
 

diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index 8901de199a6b5cf4628ee4d19d83ecc62ef89302..63a2541d4a052434d80f82c6f0c96563b00a63e8 100644 (file)
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -4523,7 +4523,6 @@ smb2_readv_callback(struct mid_q_entry *mid)
 
        if (rdata->got_bytes) {
                rqst.rq_iter      = rdata->subreq.io_iter;
-               rqst.rq_iter_size = iov_iter_count(&rdata->subreq.io_iter);
        }
 
        WARN_ONCE(rdata->server != mid->server,
@@ -4975,7 +4974,6 @@ smb2_async_writev(struct cifs_io_subrequest *wdata)
        rqst.rq_iov = iov;
        rqst.rq_nvec = 1;
        rqst.rq_iter = wdata->subreq.io_iter;
-       rqst.rq_iter_size = iov_iter_count(&rqst.rq_iter);
        if (test_bit(NETFS_SREQ_RETRYING, &wdata->subreq.flags))
                smb2_set_replay(server, &rqst);
 #ifdef CONFIG_CIFS_SMB_DIRECT