aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target/tcm_fc
diff options
context:
space:
mode:
authorAndy Grover <agrover@redhat.com>2012-01-19 16:39:18 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2012-02-25 17:37:47 -0500
commit5ebddd48ffc5b54f96a8041704de3890ee629d8f (patch)
tree4ce191729cc4f61d41683a6b84266e3c4c1453ec /drivers/target/tcm_fc
parentc8e31f26feeb03dc6f51bff68135cc58431e099b (diff)
tcm_fc: Move core->fc code conversion earlier in ft_send_tm()
No dependencies on rest of code, let's get tm_func set asap. Signed-off-by: Andy Grover <agrover@redhat.com> Cc: Kiran Patil <kiran.patil@intel.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/tcm_fc')
-rw-r--r--drivers/target/tcm_fc/tfc_cmd.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index bdf25593b81..d4c95cc2ae5 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -353,17 +353,11 @@ static void ft_send_resp_code_and_free(struct ft_cmd *cmd,
353 */ 353 */
354static void ft_send_tm(struct ft_cmd *cmd) 354static void ft_send_tm(struct ft_cmd *cmd)
355{ 355{
356 struct se_tmr_req *tmr;
357 struct fcp_cmnd *fcp; 356 struct fcp_cmnd *fcp;
358 struct ft_sess *sess; 357 struct ft_sess *sess;
359 int rc; 358 int rc;
360 u8 tm_func; 359 u8 tm_func;
361 360
362 transport_init_se_cmd(&cmd->se_cmd, &ft_configfs->tf_ops,
363 cmd->sess->se_sess, 0, DMA_NONE, 0,
364 &cmd->ft_sense_buffer[0]);
365 target_get_sess_cmd(cmd->sess->se_sess, &cmd->se_cmd, false);
366
367 fcp = fc_frame_payload_get(cmd->req_frame, sizeof(*fcp)); 361 fcp = fc_frame_payload_get(cmd->req_frame, sizeof(*fcp));
368 362
369 switch (fcp->fc_tm_flags) { 363 switch (fcp->fc_tm_flags) {
@@ -392,6 +386,11 @@ static void ft_send_tm(struct ft_cmd *cmd)
392 return; 386 return;
393 } 387 }
394 388
389 transport_init_se_cmd(&cmd->se_cmd, &ft_configfs->tf_ops,
390 cmd->sess->se_sess, 0, DMA_NONE, 0,
391 &cmd->ft_sense_buffer[0]);
392 target_get_sess_cmd(cmd->sess->se_sess, &cmd->se_cmd, false);
393
395 pr_debug("alloc tm cmd fn %d\n", tm_func); 394 pr_debug("alloc tm cmd fn %d\n", tm_func);
396 rc = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func, GFP_KERNEL); 395 rc = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func, GFP_KERNEL);
397 if (rc < 0) { 396 if (rc < 0) {