aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target/iscsi
diff options
context:
space:
mode:
authorAndy Grover <agrover@redhat.com>2012-01-19 16:39:17 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2012-02-25 17:37:47 -0500
commitc8e31f26feeb03dc6f51bff68135cc58431e099b (patch)
tree8d584fcb7cb7a58988cd2463a9a26f577410e6ac /drivers/target/iscsi
parent35b2cdc4fea1f0d13e1602c07e62c797c9fe5ed4 (diff)
target: Add SCF_SCSI_TMR_CDB usage and drop se_tmr_req_cache
Change the test for if a cmd is a tmr request to checking if SCF_SCSI_TMR_CDB (a new flag) is set in cmd->se_cmd_flags. Also remove se_tmr_req_cache usage in favor of kzalloc usage, and make core_tmr_alloc_req() return int + setup se_cmd->se_tmr_req directly and fix up various fabric module usages Cc: Andy Grover <agrover@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi')
-rw-r--r--drivers/target/iscsi/iscsi_target_util.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 11287e1ece1..4eba86d2bd8 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -229,6 +229,7 @@ struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr(
229{ 229{
230 struct iscsi_cmd *cmd; 230 struct iscsi_cmd *cmd;
231 struct se_cmd *se_cmd; 231 struct se_cmd *se_cmd;
232 int rc;
232 u8 tcm_function; 233 u8 tcm_function;
233 234
234 cmd = iscsit_allocate_cmd(conn, GFP_KERNEL); 235 cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);
@@ -286,10 +287,8 @@ struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr(
286 goto out; 287 goto out;
287 } 288 }
288 289
289 se_cmd->se_tmr_req = core_tmr_alloc_req(se_cmd, 290 rc = core_tmr_alloc_req(se_cmd, cmd->tmr_req, tcm_function, GFP_KERNEL);
290 cmd->tmr_req, tcm_function, 291 if (rc < 0)
291 GFP_KERNEL);
292 if (!se_cmd->se_tmr_req)
293 goto out; 292 goto out;
294 293
295 cmd->tmr_req->se_tmr_req = se_cmd->se_tmr_req; 294 cmd->tmr_req->se_tmr_req = se_cmd->se_tmr_req;