target: remove target_get_task_cdb

Now that tasks are always the same size as the command there is no need
to rewrite a CDB in common code.  Notw that we keep the separately allocated
CDB in the pscsi and stgt backends for now, to easy reintroducing any
command splitting local to these backends if nessecary.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

2 files changed, 2 insertions, 50 deletions

diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
index f6f6059f7f74..8e6b91d0380d 100644
--- a/drivers/target/target_core_cdb.c
+++ b/drivers/target/target_core_cdb.c
@@ -1148,52 +1148,3 @@ int target_emulate_noop(struct se_task *task)
         transport_complete_task(task, 1);
         return 0;
 }
-
-/*
- * Write a CDB into @cdb that is based on the one the intiator sent us,
- * but updated to only cover the sectors that the current task handles.
- */
-void target_get_task_cdb(struct se_task *task, unsigned char *cdb)
-{
-        struct se_cmd *cmd = task->task_se_cmd;
-        unsigned int cdb_len = scsi_command_size(cmd->t_task_cdb);
-
-        memcpy(cdb, cmd->t_task_cdb, cdb_len);
-        if (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) {
-                unsigned long long lba = task->task_lba;
-                u32 sectors = task->task_sectors;
-
-                switch (cdb_len) {
-                case 6:
-                        /* 21-bit LBA and 8-bit sectors */
-                        cdb[1] = (lba >> 16) & 0x1f;
-                        cdb[2] = (lba >> 8) & 0xff;
-                        cdb[3] = lba & 0xff;
-                        cdb[4] = sectors & 0xff;
-                        break;
-                case 10:
-                        /* 32-bit LBA and 16-bit sectors */
-                        put_unaligned_be32(lba, &cdb[2]);
-                        put_unaligned_be16(sectors, &cdb[7]);
-                        break;
-                case 12:
-                        /* 32-bit LBA and 32-bit sectors */
-                        put_unaligned_be32(lba, &cdb[2]);
-                        put_unaligned_be32(sectors, &cdb[6]);
-                        break;
-                case 16:
-                        /* 64-bit LBA and 32-bit sectors */
-                        put_unaligned_be64(lba, &cdb[2]);
-                        put_unaligned_be32(sectors, &cdb[10]);
-                        break;
-                case 32:
-                        /* 64-bit LBA and 32-bit sectors, extended CDB */
-                        put_unaligned_be64(lba, &cdb[12]);
-                        put_unaligned_be32(sectors, &cdb[28]);
-                        break;
-                default:
-                        BUG();
-                }
-        }
-}
-EXPORT_SYMBOL(target_get_task_cdb);
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 94c905fcbceb..94c7a4649632 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -1070,7 +1070,8 @@ static int pscsi_do_task(struct se_task *task)
         struct bio *hbio;
         int ret;
 
-        target_get_task_cdb(task, pt->pscsi_cdb);
+        memcpy(pt->pscsi_cdb, cmd->t_task_cdb,
+                scsi_command_size(cmd->t_task_cdb));
 
         if (task->task_se_cmd->se_cmd_flags & SCF_SCSI_NON_DATA_CDB) {
                 req = blk_get_request(pdv->pdv_sd->request_queue,