Skip to content

Commit 4d43d35

Browse files
Dr. David Alan Gilbertmartinkpetersen
Dr. David Alan Gilbert
authored and
martinkpetersen
committed
scsi: target: Remove unused functions
The functions: iscsit_check_unsolicited_dataout() iscsit_fail_session() iscsit_create_conn_recovery_datain_values() iscsit_create_conn_recovery_dataout_values() iscsit_tpg_dump_params() iscsit_print_session_params() were all added in 2011 by commit e48354c ("iscsi-target: Add iSCSI fabric support for target v4.1") but have remained unused. Remove them. Having deleted them, the functions: iscsi_print_params() iscsi_dump_conn_ops() iscsi_dump_sess_ops() are also unused. Remove them. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent a9dcee1 commit 4d43d35

10 files changed

+0
-183
lines changed

‎drivers/target/iscsi/iscsi_target.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4727,21 +4727,6 @@ int iscsit_logout_post_handler(
47274727
}
47284728
EXPORT_SYMBOL(iscsit_logout_post_handler);
47294729

4730-
void iscsit_fail_session(struct iscsit_session *sess)
4731-
{
4732-
struct iscsit_conn *conn;
4733-
4734-
spin_lock_bh(&sess->conn_lock);
4735-
list_for_each_entry(conn, &sess->sess_conn_list, conn_list) {
4736-
pr_debug("Moving to TARG_CONN_STATE_CLEANUP_WAIT.\n");
4737-
conn->conn_state = TARG_CONN_STATE_CLEANUP_WAIT;
4738-
}
4739-
spin_unlock_bh(&sess->conn_lock);
4740-
4741-
pr_debug("Moving to TARG_SESS_STATE_FAILED.\n");
4742-
sess->session_state = TARG_SESS_STATE_FAILED;
4743-
}
4744-
47454730
void iscsit_stop_session(
47464731
struct iscsit_session *sess,
47474732
int session_sleep,

‎drivers/target/iscsi/iscsi_target.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ extern int iscsi_target_tx_thread(void *);
4040
extern int iscsi_target_rx_thread(void *);
4141
extern int iscsit_close_connection(struct iscsit_conn *);
4242
extern int iscsit_close_session(struct iscsit_session *, bool can_sleep);
43-
extern void iscsit_fail_session(struct iscsit_session *);
4443
extern void iscsit_stop_session(struct iscsit_session *, int, int);
4544
extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int);
4645

‎drivers/target/iscsi/iscsi_target_erl2.c

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,54 +25,6 @@
2525
/*
2626
* FIXME: Does RData SNACK apply here as well?
2727
*/
28-
void iscsit_create_conn_recovery_datain_values(
29-
struct iscsit_cmd *cmd,
30-
__be32 exp_data_sn)
31-
{
32-
u32 data_sn = 0;
33-
struct iscsit_conn *conn = cmd->conn;
34-
35-
cmd->next_burst_len = 0;
36-
cmd->read_data_done = 0;
37-
38-
while (be32_to_cpu(exp_data_sn) > data_sn) {
39-
if ((cmd->next_burst_len +
40-
conn->conn_ops->MaxRecvDataSegmentLength) <
41-
conn->sess->sess_ops->MaxBurstLength) {
42-
cmd->read_data_done +=
43-
conn->conn_ops->MaxRecvDataSegmentLength;
44-
cmd->next_burst_len +=
45-
conn->conn_ops->MaxRecvDataSegmentLength;
46-
} else {
47-
cmd->read_data_done +=
48-
(conn->sess->sess_ops->MaxBurstLength -
49-
cmd->next_burst_len);
50-
cmd->next_burst_len = 0;
51-
}
52-
data_sn++;
53-
}
54-
}
55-
56-
void iscsit_create_conn_recovery_dataout_values(
57-
struct iscsit_cmd *cmd)
58-
{
59-
u32 write_data_done = 0;
60-
struct iscsit_conn *conn = cmd->conn;
61-
62-
cmd->data_sn = 0;
63-
cmd->next_burst_len = 0;
64-
65-
while (cmd->write_data_done > write_data_done) {
66-
if ((write_data_done + conn->sess->sess_ops->MaxBurstLength) <=
67-
cmd->write_data_done)
68-
write_data_done += conn->sess->sess_ops->MaxBurstLength;
69-
else
70-
break;
71-
}
72-
73-
cmd->write_data_done = write_data_done;
74-
}
75-
7628
static int iscsit_attach_active_connection_recovery_entry(
7729
struct iscsit_session *sess,
7830
struct iscsi_conn_recovery *cr)

‎drivers/target/iscsi/iscsi_target_erl2.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ struct iscsit_conn;
99
struct iscsi_conn_recovery;
1010
struct iscsit_session;
1111

12-
extern void iscsit_create_conn_recovery_datain_values(struct iscsit_cmd *, __be32);
13-
extern void iscsit_create_conn_recovery_dataout_values(struct iscsit_cmd *);
1412
extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(
1513
struct iscsit_session *, u16);
1614
extern void iscsit_free_connection_recovery_entries(struct iscsit_session *);

‎drivers/target/iscsi/iscsi_target_parameters.c

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -67,54 +67,6 @@ int iscsi_login_tx_data(
6767
return 0;
6868
}
6969

70-
void iscsi_dump_conn_ops(struct iscsi_conn_ops *conn_ops)
71-
{
72-
pr_debug("HeaderDigest: %s\n", (conn_ops->HeaderDigest) ?
73-
"CRC32C" : "None");
74-
pr_debug("DataDigest: %s\n", (conn_ops->DataDigest) ?
75-
"CRC32C" : "None");
76-
pr_debug("MaxRecvDataSegmentLength: %u\n",
77-
conn_ops->MaxRecvDataSegmentLength);
78-
}
79-
80-
void iscsi_dump_sess_ops(struct iscsi_sess_ops *sess_ops)
81-
{
82-
pr_debug("InitiatorName: %s\n", sess_ops->InitiatorName);
83-
pr_debug("InitiatorAlias: %s\n", sess_ops->InitiatorAlias);
84-
pr_debug("TargetName: %s\n", sess_ops->TargetName);
85-
pr_debug("TargetAlias: %s\n", sess_ops->TargetAlias);
86-
pr_debug("TargetPortalGroupTag: %hu\n",
87-
sess_ops->TargetPortalGroupTag);
88-
pr_debug("MaxConnections: %hu\n", sess_ops->MaxConnections);
89-
pr_debug("InitialR2T: %s\n",
90-
(sess_ops->InitialR2T) ? "Yes" : "No");
91-
pr_debug("ImmediateData: %s\n", (sess_ops->ImmediateData) ?
92-
"Yes" : "No");
93-
pr_debug("MaxBurstLength: %u\n", sess_ops->MaxBurstLength);
94-
pr_debug("FirstBurstLength: %u\n", sess_ops->FirstBurstLength);
95-
pr_debug("DefaultTime2Wait: %hu\n", sess_ops->DefaultTime2Wait);
96-
pr_debug("DefaultTime2Retain: %hu\n",
97-
sess_ops->DefaultTime2Retain);
98-
pr_debug("MaxOutstandingR2T: %hu\n",
99-
sess_ops->MaxOutstandingR2T);
100-
pr_debug("DataPDUInOrder: %s\n",
101-
(sess_ops->DataPDUInOrder) ? "Yes" : "No");
102-
pr_debug("DataSequenceInOrder: %s\n",
103-
(sess_ops->DataSequenceInOrder) ? "Yes" : "No");
104-
pr_debug("ErrorRecoveryLevel: %hu\n",
105-
sess_ops->ErrorRecoveryLevel);
106-
pr_debug("SessionType: %s\n", (sess_ops->SessionType) ?
107-
"Discovery" : "Normal");
108-
}
109-
110-
void iscsi_print_params(struct iscsi_param_list *param_list)
111-
{
112-
struct iscsi_param *param;
113-
114-
list_for_each_entry(param, &param_list->param_list, p_list)
115-
pr_debug("%s: %s\n", param->name, param->value);
116-
}
117-
11870
static struct iscsi_param *iscsi_set_default_param(struct iscsi_param_list *param_list,
11971
char *name, char *value, u8 phase, u8 scope, u8 sender,
12072
u16 type_range, u8 use)

‎drivers/target/iscsi/iscsi_target_parameters.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ struct iscsi_sess_ops;
3232

3333
extern int iscsi_login_rx_data(struct iscsit_conn *, char *, int);
3434
extern int iscsi_login_tx_data(struct iscsit_conn *, char *, char *, int);
35-
extern void iscsi_dump_conn_ops(struct iscsi_conn_ops *);
36-
extern void iscsi_dump_sess_ops(struct iscsi_sess_ops *);
37-
extern void iscsi_print_params(struct iscsi_param_list *);
3835
extern int iscsi_create_default_params(struct iscsi_param_list **);
3936
extern int iscsi_set_keys_to_negotiate(struct iscsi_param_list *, bool);
4037
extern int iscsi_set_keys_irrelevant_for_discovery(struct iscsi_param_list *);

‎drivers/target/iscsi/iscsi_target_tpg.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,6 @@ static void iscsit_clear_tpg_np_login_threads(
200200
spin_unlock(&tpg->tpg_np_lock);
201201
}
202202

203-
void iscsit_tpg_dump_params(struct iscsi_portal_group *tpg)
204-
{
205-
iscsi_print_params(tpg->param_list);
206-
}
207-
208203
static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg)
209204
{
210205
struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;

‎drivers/target/iscsi/iscsi_target_tpg.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ extern struct iscsi_portal_group *iscsit_get_tpg_from_np(struct iscsi_tiqn *,
1818
struct iscsi_np *, struct iscsi_tpg_np **);
1919
extern int iscsit_get_tpg(struct iscsi_portal_group *);
2020
extern void iscsit_put_tpg(struct iscsi_portal_group *);
21-
extern void iscsit_tpg_dump_params(struct iscsi_portal_group *);
2221
extern int iscsit_tpg_add_portal_group(struct iscsi_tiqn *, struct iscsi_portal_group *);
2322
extern int iscsit_tpg_del_portal_group(struct iscsi_tiqn *, struct iscsi_portal_group *,
2423
int);

‎drivers/target/iscsi/iscsi_target_util.c

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -333,50 +333,6 @@ int iscsit_sequence_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd,
333333
}
334334
EXPORT_SYMBOL(iscsit_sequence_cmd);
335335

336-
int iscsit_check_unsolicited_dataout(struct iscsit_cmd *cmd, unsigned char *buf)
337-
{
338-
struct iscsit_conn *conn = cmd->conn;
339-
struct se_cmd *se_cmd = &cmd->se_cmd;
340-
struct iscsi_data *hdr = (struct iscsi_data *) buf;
341-
u32 payload_length = ntoh24(hdr->dlength);
342-
343-
if (conn->sess->sess_ops->InitialR2T) {
344-
pr_err("Received unexpected unsolicited data"
345-
" while InitialR2T=Yes, protocol error.\n");
346-
transport_send_check_condition_and_sense(se_cmd,
347-
TCM_UNEXPECTED_UNSOLICITED_DATA, 0);
348-
return -1;
349-
}
350-
351-
if ((cmd->first_burst_len + payload_length) >
352-
conn->sess->sess_ops->FirstBurstLength) {
353-
pr_err("Total %u bytes exceeds FirstBurstLength: %u"
354-
" for this Unsolicited DataOut Burst.\n",
355-
(cmd->first_burst_len + payload_length),
356-
conn->sess->sess_ops->FirstBurstLength);
357-
transport_send_check_condition_and_sense(se_cmd,
358-
TCM_INCORRECT_AMOUNT_OF_DATA, 0);
359-
return -1;
360-
}
361-
362-
if (!(hdr->flags & ISCSI_FLAG_CMD_FINAL))
363-
return 0;
364-
365-
if (((cmd->first_burst_len + payload_length) != cmd->se_cmd.data_length) &&
366-
((cmd->first_burst_len + payload_length) !=
367-
conn->sess->sess_ops->FirstBurstLength)) {
368-
pr_err("Unsolicited non-immediate data received %u"
369-
" does not equal FirstBurstLength: %u, and does"
370-
" not equal ExpXferLen %u.\n",
371-
(cmd->first_burst_len + payload_length),
372-
conn->sess->sess_ops->FirstBurstLength, cmd->se_cmd.data_length);
373-
transport_send_check_condition_and_sense(se_cmd,
374-
TCM_INCORRECT_AMOUNT_OF_DATA, 0);
375-
return -1;
376-
}
377-
return 0;
378-
}
379-
380336
struct iscsit_cmd *iscsit_find_cmd_from_itt(
381337
struct iscsit_conn *conn,
382338
itt_t init_task_tag)
@@ -1252,20 +1208,6 @@ int iscsit_tx_login_rsp(struct iscsit_conn *conn, u8 status_class, u8 status_det
12521208
return conn->conn_transport->iscsit_put_login_tx(conn, login, 0);
12531209
}
12541210

1255-
void iscsit_print_session_params(struct iscsit_session *sess)
1256-
{
1257-
struct iscsit_conn *conn;
1258-
1259-
pr_debug("-----------------------------[Session Params for"
1260-
" SID: %u]-----------------------------\n", sess->sid);
1261-
spin_lock_bh(&sess->conn_lock);
1262-
list_for_each_entry(conn, &sess->sess_conn_list, conn_list)
1263-
iscsi_dump_conn_ops(conn->conn_ops);
1264-
spin_unlock_bh(&sess->conn_lock);
1265-
1266-
iscsi_dump_sess_ops(sess->sess_ops);
1267-
}
1268-
12691211
int rx_data(
12701212
struct iscsit_conn *conn,
12711213
struct kvec *iov,

‎drivers/target/iscsi/iscsi_target_util.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ extern struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsit_cmd *);
2323
extern struct iscsi_r2t *iscsit_get_holder_for_r2tsn(struct iscsit_cmd *, u32);
2424
extern int iscsit_sequence_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd,
2525
unsigned char * ,__be32 cmdsn);
26-
extern int iscsit_check_unsolicited_dataout(struct iscsit_cmd *, unsigned char *);
2726
extern struct iscsit_cmd *iscsit_find_cmd_from_itt_or_dump(struct iscsit_conn *,
2827
itt_t, u32);
2928
extern struct iscsit_cmd *iscsit_find_cmd_from_ttt(struct iscsit_conn *, u32);
@@ -61,7 +60,6 @@ extern int iscsit_set_login_timer_kworker(struct iscsit_conn *, struct task_stru
6160
extern int iscsit_send_tx_data(struct iscsit_cmd *, struct iscsit_conn *, int);
6261
extern int iscsit_fe_sendpage_sg(struct iscsit_cmd *, struct iscsit_conn *);
6362
extern int iscsit_tx_login_rsp(struct iscsit_conn *, u8, u8);
64-
extern void iscsit_print_session_params(struct iscsit_session *);
6563
extern int rx_data(struct iscsit_conn *, struct kvec *, int, int);
6664
extern int tx_data(struct iscsit_conn *, struct kvec *, int, int);
6765
extern void iscsit_collect_login_stats(struct iscsit_conn *, u8, u8);

0 commit comments

Comments
 (0)