diff options
author | Andy Grover <agrover@redhat.com> | 2012-04-03 18:51:23 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-04-14 20:40:37 -0400 |
commit | 065ca1e42ffd74dd03cf60f61cead35934c91ed5 (patch) | |
tree | 0b346d469892ba835b8bb85f23b74c490c6d3af3 /drivers/target/iscsi | |
parent | d28b11692e6ec577cec70606d793e14843124a03 (diff) |
target/iscsi: Move init_se_cmd closer to lookup_cmd_lun
if we can get calls to init_se_cmd, get_sess_cmd, lookup_cmd_lun,
core_alua_check_nonop_delay, and handle_cdb_direct next to each other,
then we can just call target_submit_cmd. This is a step towards that
goal.
Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi')
-rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 57cef3b44c36..1b51a3ed17f5 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
@@ -988,17 +988,6 @@ done: | |||
988 | sam_task_attr = MSG_SIMPLE_TAG; | 988 | sam_task_attr = MSG_SIMPLE_TAG; |
989 | } | 989 | } |
990 | 990 | ||
991 | /* | ||
992 | * Initialize struct se_cmd descriptor from target_core_mod infrastructure | ||
993 | */ | ||
994 | transport_init_se_cmd(&cmd->se_cmd, &lio_target_fabric_configfs->tf_ops, | ||
995 | conn->sess->se_sess, cmd->data_length, cmd->data_direction, | ||
996 | sam_task_attr, &cmd->sense_buffer[0]); | ||
997 | |||
998 | pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x," | ||
999 | " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt, | ||
1000 | hdr->cmdsn, hdr->data_length, payload_length, conn->cid); | ||
1001 | |||
1002 | cmd->iscsi_opcode = ISCSI_OP_SCSI_CMD; | 991 | cmd->iscsi_opcode = ISCSI_OP_SCSI_CMD; |
1003 | cmd->i_state = ISTATE_NEW_CMD; | 992 | cmd->i_state = ISTATE_NEW_CMD; |
1004 | cmd->immediate_cmd = ((hdr->opcode & ISCSI_OP_IMMEDIATE) ? 1 : 0); | 993 | cmd->immediate_cmd = ((hdr->opcode & ISCSI_OP_IMMEDIATE) ? 1 : 0); |
@@ -1034,6 +1023,17 @@ done: | |||
1034 | } | 1023 | } |
1035 | 1024 | ||
1036 | /* | 1025 | /* |
1026 | * Initialize struct se_cmd descriptor from target_core_mod infrastructure | ||
1027 | */ | ||
1028 | transport_init_se_cmd(&cmd->se_cmd, &lio_target_fabric_configfs->tf_ops, | ||
1029 | conn->sess->se_sess, cmd->data_length, cmd->data_direction, | ||
1030 | sam_task_attr, &cmd->sense_buffer[0]); | ||
1031 | |||
1032 | pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x," | ||
1033 | " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt, | ||
1034 | hdr->cmdsn, hdr->data_length, payload_length, conn->cid); | ||
1035 | |||
1036 | /* | ||
1037 | * The CDB is going to an se_device_t. | 1037 | * The CDB is going to an se_device_t. |
1038 | */ | 1038 | */ |
1039 | ret = transport_lookup_cmd_lun(&cmd->se_cmd, | 1039 | ret = transport_lookup_cmd_lun(&cmd->se_cmd, |