target: iscsi: remove the iscsi_data_count structure
Subsystems (2)
PATCH 1/1 target: iscsi: remove the iscsi_data_count structure
This patch removes the iscsi_data_count structure and the iscsit_do_rx_data() function because they are used only by rx_data()
Signed-off-by Maurizio Lombardi <[email protected]>
--- drivers/target/iscsi/iscsi_target_util.c | 30 +++++------------------- include/target/iscsi/iscsi_target_core.h | 10 -------- 2 files changed, 6 insertions(+), 34 deletions(-)
drivers/target/iscsi/iscsi_target_util.c +6 -24
@@ -1236,18 +1236,20 @@ void iscsit_print_session_params(struct iscsi_session *sess)iscsi_dump_sess_ops (sess->sess_ops); } -static int iscsit_do_rx_data ( +int rx_data (struct iscsi_conn *conn, -struct iscsi_data_count *count) +struct kvec *iov, +int iov_count, +int data) { -int data = count->data_length, rx_loop =0 , total_rx =0 ; +int rx_loop =0 , total_rx =0 ;struct msghdr msg;if (!conn || !conn->sock || !conn->conn_ops)return -1 ;memset (&msg,0 ,sizeof (struct msghdr )); -iov_iter_kvec (&msg.msg_iter,READ , count->iov, count->iov_count, data); +iov_iter_kvec (&msg.msg_iter,READ , iov, iov_count, data);while (msg_data_left (&msg)) { rx_loop =sock_recvmsg (conn->sock, &msg,MSG_WAITALL );
@@ -1264,26 +1266,6 @@ static int iscsit_do_rx_data(return total_rx; } -int rx_data ( -struct iscsi_conn *conn, -struct kvec *iov, -int iov_count, -int data) -{ -struct iscsi_data_count c; - -if (!conn || !conn->sock || !conn->conn_ops) -return -1 ; - -memset (&c,0 ,sizeof (struct iscsi_data_count )); - c.iov = iov; - c.iov_count = iov_count; - c.data_length = data; - c.type =ISCSI_RX_DATA ; - -return iscsit_do_rx_data (conn, &c); -} - int tx_data( struct iscsi_conn *conn, struct kvec *iov,
include/target/iscsi/iscsi_target_core.h +0 -10
@@ -301,16 +301,6 @@ struct iscsi_queue_req {struct list_head qr_list; }; -struct iscsi_data_count { -int data_length; -int sync_and_steering; -enum data_count_type type; -u32 iov_count; -u32 ss_iov_count; -u32 ss_marker_count; -struct kvec *iov; -}; -struct iscsi_param_list {bool iser;struct list_head param_list;
Signature · 1 line
2.25.3
Quoted 77 lines · Maurizio Lombardi
This patch removes the
iscsi_data_countstructure and theiscsit_do_rx_data()function because they are used only byrx_data()Signed-off-by Maurizio Lombardi <[email protected]>--- drivers/target/iscsi/iscsi_target_util.c | 30 +++++------------------- include/target/iscsi/iscsi_target_core.h | 10 -------- 2 files changed, 6 insertions(+), 34 deletions(-)drivers/target/iscsi/iscsi_target_util.c +6
-24@@ -1236,18 +1236,20 @@ void iscsit_print_session_params(struct iscsi_session *sess)iscsi_dump_sess_ops (sess->sess_ops); } -static int iscsit_do_rx_data ( +int rx_data (struct iscsi_conn *conn, -struct iscsi_data_count *count) +struct kvec *iov, +int iov_count, +int data) { -int data = count->data_length, rx_loop =0 , total_rx =0 ; +int rx_loop =0 , total_rx =0 ;struct msghdr msg;if (!conn || !conn->sock || !conn->conn_ops)return -1 ;memset (&msg,0 ,sizeof (struct msghdr )); -iov_iter_kvec (&msg.msg_iter,READ , count->iov, count->iov_count, data); +iov_iter_kvec (&msg.msg_iter,READ , iov, iov_count, data);while (msg_data_left (&msg)) { rx_loop =sock_recvmsg (conn->sock, &msg,MSG_WAITALL );@@ -1264,26 +1266,6 @@ static int iscsit_do_rx_data(return total_rx; } -int rx_data ( -struct iscsi_conn *conn, -struct kvec *iov, -int iov_count, -int data) -{ -struct iscsi_data_count c; - -if (!conn || !conn->sock || !conn->conn_ops) -return -1 ; - -memset (&c,0 ,sizeof (struct iscsi_data_count )); - c.iov = iov; - c.iov_count = iov_count; - c.data_length = data; - c.type =ISCSI_RX_DATA ; - -return iscsit_do_rx_data (conn, &c); -} - int tx_data( struct iscsi_conn *conn, struct kvec *iov,include/target/iscsi/iscsi_target_core.h +0
-3@@ -301,16 +301,6 @@ struct iscsi_queue_req {struct list_head qr_list; }; -struct iscsi_data_count { -int data_length; -int sync_and_steering;
include/target/iscsi/iscsi_target_core.h struct iscsi_queue_req { · line 306
Quoted 10 lines
include/target/iscsi/iscsi_target_core.h +0
-7-enum data_count_type type; -u32 iov_count; -u32 ss_iov_count; -u32 ss_marker_count; -struct kvec *iov; -}; -struct iscsi_param_list {bool iser;struct list_head param_list;
Reviewed-by Mike Christie <[email protected]>
Martin K. Petersen
AppliedMaurizio,
Quoted 2 lines
This patch removes the
iscsi_data_countstructure and theiscsit_do_rx_data()function because they are used only byrx_data()
Applied to 5.8/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering