p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: 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()

Link: https://lore.kernel.org/r/20200424113913.17237-1-mlombard@redhat.com
Reviewed-by: Mike Christie <mchristi@redhat.com>
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Maurizio Lombardi 2020-04-24 13:39:13 +02:00 committed by Martin K. Petersen
parent f983622ae6
commit 7c59dace7e
2 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/target/iscsi/iscsi_target_util.c
View File

@ -1228,18 +1228,20 @@ void iscsit_print_session_params(struct iscsi_session *sess)
iscsi_dump_sess_ops(sess->sess_ops); iscsi_dump_sess_ops(sess->sess_ops);
} }
static int iscsit_do_rx_data( int rx_data(
struct iscsi_conn *conn, 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; struct msghdr msg;
if (!conn || !conn->sock || !conn->conn_ops) if (!conn || !conn->sock || !conn->conn_ops)
return -1; return -1;
memset(&msg, 0, sizeof(struct msghdr)); 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)) { while (msg_data_left(&msg)) {
rx_loop = sock_recvmsg(conn->sock, &msg, MSG_WAITALL); rx_loop = sock_recvmsg(conn->sock, &msg, MSG_WAITALL);
@ -1256,26 +1258,6 @@ static int iscsit_do_rx_data(
return total_rx; 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( int tx_data(
struct iscsi_conn *conn, struct iscsi_conn *conn,
struct kvec *iov, struct kvec *iov,

10
include/target/iscsi/iscsi_target_core.h
View File

@ -301,16 +301,6 @@ struct iscsi_queue_req {
struct list_head qr_list; 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 { struct iscsi_param_list {
bool iser; bool iser;
struct list_head param_list; struct list_head param_list;