diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-11-14 11:36:30 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-12-06 01:00:53 -0500 |
commit | 33c3fafc43e56a22be60ebe67bec5ba763d51010 (patch) | |
tree | 87a482353c77ff469b4d7b4fab8df105087d8cf9 /drivers/target | |
parent | 2d3a4b51df4db2ee0415f42a63b9629a7977b975 (diff) |
target: remove the t_tasks_bidi se_cmd field
And use a SCF_BIDI flag instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r-- | drivers/target/loopback/tcm_loop.c | 8 | ||||
-rw-r--r-- | drivers/target/target_core_transport.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c index 0ca89f02e26f..81d5832fbbd5 100644 --- a/drivers/target/loopback/tcm_loop.c +++ b/drivers/target/loopback/tcm_loop.c | |||
@@ -113,11 +113,9 @@ static struct se_cmd *tcm_loop_allocate_core_cmd( | |||
113 | scsi_bufflen(sc), sc->sc_data_direction, sam_task_attr, | 113 | scsi_bufflen(sc), sc->sc_data_direction, sam_task_attr, |
114 | &tl_cmd->tl_sense_buf[0]); | 114 | &tl_cmd->tl_sense_buf[0]); |
115 | 115 | ||
116 | /* | ||
117 | * Signal BIDI usage with T_TASK(cmd)->t_tasks_bidi | ||
118 | */ | ||
119 | if (scsi_bidi_cmnd(sc)) | 116 | if (scsi_bidi_cmnd(sc)) |
120 | se_cmd->t_tasks_bidi = 1; | 117 | se_cmd->se_cmd_flags |= SCF_BIDI; |
118 | |||
121 | /* | 119 | /* |
122 | * Locate the struct se_lun pointer and attach it to struct se_cmd | 120 | * Locate the struct se_lun pointer and attach it to struct se_cmd |
123 | */ | 121 | */ |
@@ -154,7 +152,7 @@ static int tcm_loop_new_cmd_map(struct se_cmd *se_cmd) | |||
154 | * For BIDI commands, pass in the extra READ buffer | 152 | * For BIDI commands, pass in the extra READ buffer |
155 | * to transport_generic_map_mem_to_cmd() below.. | 153 | * to transport_generic_map_mem_to_cmd() below.. |
156 | */ | 154 | */ |
157 | if (se_cmd->t_tasks_bidi) { | 155 | if (se_cmd->se_cmd_flags & SCF_BIDI) { |
158 | struct scsi_data_buffer *sdb = scsi_in(sc); | 156 | struct scsi_data_buffer *sdb = scsi_in(sc); |
159 | 157 | ||
160 | sgl_bidi = sdb->table.sgl; | 158 | sgl_bidi = sdb->table.sgl; |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 866af5d5869f..8f29f472c50b 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -2598,7 +2598,7 @@ static int transport_generic_cmd_sequencer( | |||
2598 | break; | 2598 | break; |
2599 | case XDWRITEREAD_10: | 2599 | case XDWRITEREAD_10: |
2600 | if ((cmd->data_direction != DMA_TO_DEVICE) || | 2600 | if ((cmd->data_direction != DMA_TO_DEVICE) || |
2601 | !(cmd->t_tasks_bidi)) | 2601 | !(cmd->se_cmd_flags & SCF_BIDI)) |
2602 | goto out_invalid_cdb_field; | 2602 | goto out_invalid_cdb_field; |
2603 | sectors = transport_get_sectors_10(cdb, cmd, §or_ret); | 2603 | sectors = transport_get_sectors_10(cdb, cmd, §or_ret); |
2604 | if (sector_ret) | 2604 | if (sector_ret) |