diff options
-rw-r--r-- | drivers/infiniband/ulp/isert/ib_isert.c | 2 | ||||
-rw-r--r-- | drivers/target/iscsi/cxgbit/cxgbit_target.c | 2 | ||||
-rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 8 | ||||
-rw-r--r-- | drivers/target/iscsi/iscsi_target.h | 2 | ||||
-rw-r--r-- | drivers/target/iscsi/iscsi_target_erl1.c | 2 | ||||
-rw-r--r-- | include/target/iscsi/iscsi_transport.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index e3dd13798d79..989f1ac4245c 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c | |||
@@ -1186,7 +1186,7 @@ sequence_cmd: | |||
1186 | rc = iscsit_sequence_cmd(conn, cmd, buf, hdr->cmdsn); | 1186 | rc = iscsit_sequence_cmd(conn, cmd, buf, hdr->cmdsn); |
1187 | 1187 | ||
1188 | if (!rc && dump_payload == false && unsol_data) | 1188 | if (!rc && dump_payload == false && unsol_data) |
1189 | iscsit_set_unsoliticed_dataout(cmd); | 1189 | iscsit_set_unsolicited_dataout(cmd); |
1190 | else if (dump_payload && imm_data) | 1190 | else if (dump_payload && imm_data) |
1191 | target_put_sess_cmd(&cmd->se_cmd); | 1191 | target_put_sess_cmd(&cmd->se_cmd); |
1192 | 1192 | ||
diff --git a/drivers/target/iscsi/cxgbit/cxgbit_target.c b/drivers/target/iscsi/cxgbit/cxgbit_target.c index 25eb3891e34b..29b350a0b58f 100644 --- a/drivers/target/iscsi/cxgbit/cxgbit_target.c +++ b/drivers/target/iscsi/cxgbit/cxgbit_target.c | |||
@@ -960,7 +960,7 @@ after_immediate_data: | |||
960 | target_put_sess_cmd(&cmd->se_cmd); | 960 | target_put_sess_cmd(&cmd->se_cmd); |
961 | return 0; | 961 | return 0; |
962 | } else if (cmd->unsolicited_data) { | 962 | } else if (cmd->unsolicited_data) { |
963 | iscsit_set_unsoliticed_dataout(cmd); | 963 | iscsit_set_unsolicited_dataout(cmd); |
964 | } | 964 | } |
965 | 965 | ||
966 | } else if (immed_ret == IMMEDIATE_DATA_ERL1_CRC_FAILURE) { | 966 | } else if (immed_ret == IMMEDIATE_DATA_ERL1_CRC_FAILURE) { |
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 98984c3adfba..7059ffdb0c20 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
@@ -1194,7 +1194,7 @@ attach_cmd: | |||
1194 | } | 1194 | } |
1195 | EXPORT_SYMBOL(iscsit_setup_scsi_cmd); | 1195 | EXPORT_SYMBOL(iscsit_setup_scsi_cmd); |
1196 | 1196 | ||
1197 | void iscsit_set_unsoliticed_dataout(struct iscsi_cmd *cmd) | 1197 | void iscsit_set_unsolicited_dataout(struct iscsi_cmd *cmd) |
1198 | { | 1198 | { |
1199 | iscsit_set_dataout_sequence_values(cmd); | 1199 | iscsit_set_dataout_sequence_values(cmd); |
1200 | 1200 | ||
@@ -1202,7 +1202,7 @@ void iscsit_set_unsoliticed_dataout(struct iscsi_cmd *cmd) | |||
1202 | iscsit_start_dataout_timer(cmd, cmd->conn); | 1202 | iscsit_start_dataout_timer(cmd, cmd->conn); |
1203 | spin_unlock_bh(&cmd->dataout_timeout_lock); | 1203 | spin_unlock_bh(&cmd->dataout_timeout_lock); |
1204 | } | 1204 | } |
1205 | EXPORT_SYMBOL(iscsit_set_unsoliticed_dataout); | 1205 | EXPORT_SYMBOL(iscsit_set_unsolicited_dataout); |
1206 | 1206 | ||
1207 | int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, | 1207 | int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, |
1208 | struct iscsi_scsi_req *hdr) | 1208 | struct iscsi_scsi_req *hdr) |
@@ -1236,7 +1236,7 @@ int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, | |||
1236 | */ | 1236 | */ |
1237 | if (!cmd->immediate_data) { | 1237 | if (!cmd->immediate_data) { |
1238 | if (!cmd->sense_reason && cmd->unsolicited_data) | 1238 | if (!cmd->sense_reason && cmd->unsolicited_data) |
1239 | iscsit_set_unsoliticed_dataout(cmd); | 1239 | iscsit_set_unsolicited_dataout(cmd); |
1240 | if (!cmd->sense_reason) | 1240 | if (!cmd->sense_reason) |
1241 | return 0; | 1241 | return 0; |
1242 | 1242 | ||
@@ -1308,7 +1308,7 @@ after_immediate_data: | |||
1308 | target_put_sess_cmd(&cmd->se_cmd); | 1308 | target_put_sess_cmd(&cmd->se_cmd); |
1309 | return rc; | 1309 | return rc; |
1310 | } else if (cmd->unsolicited_data) | 1310 | } else if (cmd->unsolicited_data) |
1311 | iscsit_set_unsoliticed_dataout(cmd); | 1311 | iscsit_set_unsolicited_dataout(cmd); |
1312 | 1312 | ||
1313 | } else if (immed_ret == IMMEDIATE_DATA_ERL1_CRC_FAILURE) { | 1313 | } else if (immed_ret == IMMEDIATE_DATA_ERL1_CRC_FAILURE) { |
1314 | /* | 1314 | /* |
diff --git a/drivers/target/iscsi/iscsi_target.h b/drivers/target/iscsi/iscsi_target.h index 48bac0acf8c7..c95f56a3ce31 100644 --- a/drivers/target/iscsi/iscsi_target.h +++ b/drivers/target/iscsi/iscsi_target.h | |||
@@ -31,7 +31,7 @@ extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *, | |||
31 | struct iscsi_portal_group *, bool); | 31 | struct iscsi_portal_group *, bool); |
32 | extern int iscsit_del_np(struct iscsi_np *); | 32 | extern int iscsit_del_np(struct iscsi_np *); |
33 | extern int iscsit_reject_cmd(struct iscsi_cmd *cmd, u8, unsigned char *); | 33 | extern int iscsit_reject_cmd(struct iscsi_cmd *cmd, u8, unsigned char *); |
34 | extern void iscsit_set_unsoliticed_dataout(struct iscsi_cmd *); | 34 | extern void iscsit_set_unsolicited_dataout(struct iscsi_cmd *); |
35 | extern int iscsit_logout_closesession(struct iscsi_cmd *, struct iscsi_conn *); | 35 | extern int iscsit_logout_closesession(struct iscsi_cmd *, struct iscsi_conn *); |
36 | extern int iscsit_logout_closeconnection(struct iscsi_cmd *, struct iscsi_conn *); | 36 | extern int iscsit_logout_closeconnection(struct iscsi_cmd *, struct iscsi_conn *); |
37 | extern int iscsit_logout_removeconnforrecovery(struct iscsi_cmd *, struct iscsi_conn *); | 37 | extern int iscsit_logout_removeconnforrecovery(struct iscsi_cmd *, struct iscsi_conn *); |
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c index 38210ab09887..c27335c29640 100644 --- a/drivers/target/iscsi/iscsi_target_erl1.c +++ b/drivers/target/iscsi/iscsi_target_erl1.c | |||
@@ -979,7 +979,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo) | |||
979 | if (cmd->se_cmd.transport_state & CMD_T_ABORTED) | 979 | if (cmd->se_cmd.transport_state & CMD_T_ABORTED) |
980 | return 0; | 980 | return 0; |
981 | 981 | ||
982 | iscsit_set_unsoliticed_dataout(cmd); | 982 | iscsit_set_unsolicited_dataout(cmd); |
983 | } | 983 | } |
984 | return transport_handle_cdb_direct(&cmd->se_cmd); | 984 | return transport_handle_cdb_direct(&cmd->se_cmd); |
985 | 985 | ||
diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h index 91948bc5b185..8b4b8ce2c1ae 100644 --- a/include/target/iscsi/iscsi_transport.h +++ b/include/target/iscsi/iscsi_transport.h | |||
@@ -53,7 +53,7 @@ extern void iscsit_put_transport(struct iscsit_transport *); | |||
53 | */ | 53 | */ |
54 | extern int iscsit_setup_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *, | 54 | extern int iscsit_setup_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *, |
55 | unsigned char *); | 55 | unsigned char *); |
56 | extern void iscsit_set_unsoliticed_dataout(struct iscsi_cmd *); | 56 | extern void iscsit_set_unsolicited_dataout(struct iscsi_cmd *); |
57 | extern int iscsit_process_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *, | 57 | extern int iscsit_process_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *, |
58 | struct iscsi_scsi_req *); | 58 | struct iscsi_scsi_req *); |
59 | extern int | 59 | extern int |