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>

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 57cef3b44c36a9c31e0d37190483a0a24a81f46b..1b51a3ed17f56c5773446c8645ff91422afc5728 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -988,17 +988,6 @@ done:
                sam_task_attr = MSG_SIMPLE_TAG;
        }
 
-       /*
-        * Initialize struct se_cmd descriptor from target_core_mod infrastructure
-        */
-       transport_init_se_cmd(&cmd->se_cmd, &lio_target_fabric_configfs->tf_ops,
-                       conn->sess->se_sess, cmd->data_length, cmd->data_direction,
-                       sam_task_attr, &cmd->sense_buffer[0]);
-
-       pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x,"
-               " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,
-               hdr->cmdsn, hdr->data_length, payload_length, conn->cid);
-
        cmd->iscsi_opcode       = ISCSI_OP_SCSI_CMD;
        cmd->i_state            = ISTATE_NEW_CMD;
        cmd->immediate_cmd      = ((hdr->opcode & ISCSI_OP_IMMEDIATE) ? 1 : 0);
@@ -1033,6 +1022,17 @@ done:
                iscsit_attach_datain_req(cmd, dr);
        }
 
+       /*
+        * Initialize struct se_cmd descriptor from target_core_mod infrastructure
+        */
+       transport_init_se_cmd(&cmd->se_cmd, &lio_target_fabric_configfs->tf_ops,
+                       conn->sess->se_sess, cmd->data_length, cmd->data_direction,
+                       sam_task_attr, &cmd->sense_buffer[0]);
+
+       pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x,"
+               " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,
+               hdr->cmdsn, hdr->data_length, payload_length, conn->cid);
+
        /*
         * The CDB is going to an se_device_t.
         */