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: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 1e3866eb80a8f11a7eb592f59ce9e9681958347e..e2c8198020de04149c2116f46fe699e49a90efc8 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1768,7 +1768,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
                kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
                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) {
                kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
                if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT) {

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 179aaceeb732e1f76bdee8882606f10308d013b0..d68363a79db7fe8b47586d4ea70fddf0e16c7b33 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1016,13 +1016,8 @@ done:
                send_check_condition = 1;
                goto attach_cmd;
        }
-       /*
-        * The Initiator Node has access to the LUN (the addressing method
-        * 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);
+
+       transport_ret = target_setup_cmd_from_cdb(&cmd->se_cmd, hdr->cdb);
        if (transport_ret == -ENOMEM) {
                return iscsit_add_reject_from_cmd(
                                ISCSI_REASON_BOOKMARK_NO_RESOURCES,

diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index a9b4eeefe9fc3ce56042e41a2d96169279a6e1e7..38dfac2b0a1cf1ee91602ab896d4cb271d52195a 100644 (file)
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -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
         * 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
-        * by target core in transport_generic_allocate_tasks() ->
+        * by target core in target_setup_cmd_from_cdb() ->
         * transport_generic_cmd_sequencer().
         */
        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)
                }
        }
 
-       ret = transport_generic_allocate_tasks(se_cmd, sc->cmnd);
+       ret = target_setup_cmd_from_cdb(se_cmd, sc->cmnd);
        if (ret == -ENOMEM) {
                transport_send_check_condition_and_sense(se_cmd,
                                TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 1bd8837543a8e27cdb3599110201798170cab499..61e85d8546a766cb5ca5a7176fa57664f60f1a9d 100644 (file)
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1550,11 +1550,11 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
        return 0;
 }
 
-/*     transport_generic_allocate_tasks():
+/*     target_setup_cmd_from_cdb():
  *
  *     Called from fabric RX Thread.
  */
-int transport_generic_allocate_tasks(
+int target_setup_cmd_from_cdb(
        struct se_cmd *cmd,
        unsigned char *cdb)
 {
@@ -1620,7 +1620,7 @@ int transport_generic_allocate_tasks(
        spin_unlock(&cmd->se_lun->lun_sep_lock);
        return 0;
 }
-EXPORT_SYMBOL(transport_generic_allocate_tasks);
+EXPORT_SYMBOL(target_setup_cmd_from_cdb);
 
 /*
  * 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,
         * Sanitize CDBs via transport_generic_cmd_sequencer() and
         * 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) {
                transport_generic_request_failure(se_cmd);
                return;
@@ -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
  *     drivers.
  *
- *     Called from transport_generic_allocate_tasks() in the $FABRIC_MOD
+ *     Called from target_setup_cmd_from_cdb() in the $FABRIC_MOD
  *     RX Thread.
  *
  *     FIXME: Need to support other SCSI OPCODES where as well.

diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 83734ccc982c06d2ea0f9b9e2ab5d2085f9fe1fa..9007833ac5ca172330585f883fb7e930071e5260 100644 (file)
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -106,7 +106,7 @@ void        transport_deregister_session(struct se_session *);
 void   transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
                struct se_session *, u32, int, int, unsigned char *);
 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 *,
                unsigned char *, u32, u32, int, int, int);
 int    target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,