Commit b608e2c3 authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Steve French
Browse files

smb/client: remove unused rq_iter_size from struct smb_rqst 



Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Fixes: d08089f6 ("cifs: Change the I/O paths to use an iterator rather than a page list")
Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent c724b2ab

fs/smb/client/cifsglob.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

};

fs/smb/client/cifssmb.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

fs/smb/client/smb2ops.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

	}

fs/smb/client/smb2pdu.c

+0 −2
Original line number Diff line number Diff line
@@ -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