Commit a12f41f8 authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger

target: Rename target_allocate_tasks to target_setup_cmd_from_cdb

This patch renames a horribly misnamed function that no longer allocate
tasks to something more descriptive for it's modern use in target core.

(nab: Fix up ib_srpt to use this as well ahead of a target_submit_cmd
conversion)
Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 8b1e1244
...@@ -1768,7 +1768,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, ...@@ -1768,7 +1768,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref); kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
goto send_sense; goto send_sense;
} }
ret = transport_generic_allocate_tasks(cmd, srp_cmd->cdb); ret = target_setup_cmd_from_cdb(cmd, srp_cmd->cdb);
if (ret < 0) { if (ret < 0) {
kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref); kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT) { if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT) {
......
...@@ -1016,13 +1016,8 @@ static int iscsit_handle_scsi_cmd( ...@@ -1016,13 +1016,8 @@ static int iscsit_handle_scsi_cmd(
send_check_condition = 1; send_check_condition = 1;
goto attach_cmd; goto attach_cmd;
} }
/*
* The Initiator Node has access to the LUN (the addressing method transport_ret = target_setup_cmd_from_cdb(&cmd->se_cmd, hdr->cdb);
* is handled inside of iscsit_get_lun_for_cmd()). Now it's time to
* allocate 1->N transport tasks (depending on sector count and
* maximum request size the physical HBA(s) can handle.
*/
transport_ret = transport_generic_allocate_tasks(&cmd->se_cmd, hdr->cdb);
if (transport_ret == -ENOMEM) { if (transport_ret == -ENOMEM) {
return iscsit_add_reject_from_cmd( return iscsit_add_reject_from_cmd(
ISCSI_REASON_BOOKMARK_NO_RESOURCES, ISCSI_REASON_BOOKMARK_NO_RESOURCES,
......
...@@ -213,7 +213,7 @@ static void tcm_loop_submission_work(struct work_struct *work) ...@@ -213,7 +213,7 @@ static void tcm_loop_submission_work(struct work_struct *work)
* associated read buffers, go ahead and do that here for type * associated read buffers, go ahead and do that here for type
* SCF_SCSI_CONTROL_SG_IO_CDB. Also note that this is currently * SCF_SCSI_CONTROL_SG_IO_CDB. Also note that this is currently
* guaranteed to be a single SGL for SCF_SCSI_CONTROL_SG_IO_CDB * guaranteed to be a single SGL for SCF_SCSI_CONTROL_SG_IO_CDB
* by target core in transport_generic_allocate_tasks() -> * by target core in target_setup_cmd_from_cdb() ->
* transport_generic_cmd_sequencer(). * transport_generic_cmd_sequencer().
*/ */
if (se_cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB && if (se_cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB &&
...@@ -227,7 +227,7 @@ static void tcm_loop_submission_work(struct work_struct *work) ...@@ -227,7 +227,7 @@ static void tcm_loop_submission_work(struct work_struct *work)
} }
} }
ret = transport_generic_allocate_tasks(se_cmd, sc->cmnd); ret = target_setup_cmd_from_cdb(se_cmd, sc->cmnd);
if (ret == -ENOMEM) { if (ret == -ENOMEM) {
transport_send_check_condition_and_sense(se_cmd, transport_send_check_condition_and_sense(se_cmd,
TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0); TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);
......
...@@ -1550,11 +1550,11 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd) ...@@ -1550,11 +1550,11 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
return 0; return 0;
} }
/* transport_generic_allocate_tasks(): /* target_setup_cmd_from_cdb():
* *
* Called from fabric RX Thread. * Called from fabric RX Thread.
*/ */
int transport_generic_allocate_tasks( int target_setup_cmd_from_cdb(
struct se_cmd *cmd, struct se_cmd *cmd,
unsigned char *cdb) unsigned char *cdb)
{ {
...@@ -1620,7 +1620,7 @@ int transport_generic_allocate_tasks( ...@@ -1620,7 +1620,7 @@ int transport_generic_allocate_tasks(
spin_unlock(&cmd->se_lun->lun_sep_lock); spin_unlock(&cmd->se_lun->lun_sep_lock);
return 0; return 0;
} }
EXPORT_SYMBOL(transport_generic_allocate_tasks); EXPORT_SYMBOL(target_setup_cmd_from_cdb);
/* /*
* Used by fabric module frontends to queue tasks directly. * Used by fabric module frontends to queue tasks directly.
...@@ -1728,7 +1728,7 @@ void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess, ...@@ -1728,7 +1728,7 @@ void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
* Sanitize CDBs via transport_generic_cmd_sequencer() and * Sanitize CDBs via transport_generic_cmd_sequencer() and
* allocate the necessary tasks to complete the received CDB+data * allocate the necessary tasks to complete the received CDB+data
*/ */
rc = transport_generic_allocate_tasks(se_cmd, cdb); rc = target_setup_cmd_from_cdb(se_cmd, cdb);
if (rc != 0) { if (rc != 0) {
transport_generic_request_failure(se_cmd); transport_generic_request_failure(se_cmd);
return; return;
...@@ -2583,7 +2583,7 @@ static int target_check_write_same_discard(unsigned char *flags, struct se_devic ...@@ -2583,7 +2583,7 @@ static int target_check_write_same_discard(unsigned char *flags, struct se_devic
* Generic Command Sequencer that should work for most DAS transport * Generic Command Sequencer that should work for most DAS transport
* drivers. * drivers.
* *
* Called from transport_generic_allocate_tasks() in the $FABRIC_MOD * Called from target_setup_cmd_from_cdb() in the $FABRIC_MOD
* RX Thread. * RX Thread.
* *
* FIXME: Need to support other SCSI OPCODES where as well. * FIXME: Need to support other SCSI OPCODES where as well.
......
...@@ -106,7 +106,7 @@ void transport_deregister_session(struct se_session *); ...@@ -106,7 +106,7 @@ void transport_deregister_session(struct se_session *);
void transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *, void transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
struct se_session *, u32, int, int, unsigned char *); struct se_session *, u32, int, int, unsigned char *);
int transport_lookup_cmd_lun(struct se_cmd *, u32); int transport_lookup_cmd_lun(struct se_cmd *, u32);
int transport_generic_allocate_tasks(struct se_cmd *, unsigned char *); int target_setup_cmd_from_cdb(struct se_cmd *, unsigned char *);
void target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *, void target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
unsigned char *, u32, u32, int, int, int); unsigned char *, u32, u32, int, int, int);
int target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess, int target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment