Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging

[linux-2.6-microblaze.git] / drivers / target / iscsi / iscsi_target.c

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index e5c443b..2c54c5d 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1154,10 +1154,10 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
        /*
         * Initialize struct se_cmd descriptor from target_core_mod infrastructure
         */
-       transport_init_se_cmd(&cmd->se_cmd, &iscsi_ops,
-                       conn->sess->se_sess, be32_to_cpu(hdr->data_length),
-                       cmd->data_direction, sam_task_attr,
-                       cmd->sense_buffer + 2, scsilun_to_int(&hdr->lun));
+       __target_init_cmd(&cmd->se_cmd, &iscsi_ops,
+                        conn->sess->se_sess, be32_to_cpu(hdr->data_length),
+                        cmd->data_direction, sam_task_attr,
+                        cmd->sense_buffer + 2, scsilun_to_int(&hdr->lun));
 
        pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x,"
                " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,
@@ -1167,7 +1167,9 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
        target_get_sess_cmd(&cmd->se_cmd, true);
 
        cmd->se_cmd.tag = (__force u32)cmd->init_task_tag;
-       cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb);
+       cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
+                                               GFP_KERNEL);
+
        if (cmd->sense_reason) {
                if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
                        return iscsit_add_reject_cmd(cmd,
@@ -2012,10 +2014,10 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
                                             buf);
        }
 
-       transport_init_se_cmd(&cmd->se_cmd, &iscsi_ops,
-                             conn->sess->se_sess, 0, DMA_NONE,
-                             TCM_SIMPLE_TAG, cmd->sense_buffer + 2,
-                             scsilun_to_int(&hdr->lun));
+       __target_init_cmd(&cmd->se_cmd, &iscsi_ops,
+                         conn->sess->se_sess, 0, DMA_NONE,
+                         TCM_SIMPLE_TAG, cmd->sense_buffer + 2,
+                         scsilun_to_int(&hdr->lun));
 
        target_get_sess_cmd(&cmd->se_cmd, true);