nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

target/tcm_loop: Merge struct tcm_loop_cmd and struct tcm_loop_tmr

Browse source 
This patch simplifies the tcm_loop implementation but does not
change any functionality.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Cc: David Disseldorp <ddiss@suse.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Bart Van Assche 2017-05-23 16:48:39 -07:00 committed by Nicholas Bellinger
parent c00e622023
commit 4d3895d5ea
2 changed files with 10 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/target/loopback/tcm_loop.c
View file

@ -221,7 +221,6 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,
struct se_portal_group *se_tpg; struct se_portal_group *se_tpg;
struct tcm_loop_nexus *tl_nexus; struct tcm_loop_nexus *tl_nexus;
struct tcm_loop_cmd *tl_cmd = NULL; struct tcm_loop_cmd *tl_cmd = NULL;
struct tcm_loop_tmr *tl_tmr = NULL;
int ret = TMR_FUNCTION_FAILED, rc; int ret = TMR_FUNCTION_FAILED, rc;
/* /*
@ -240,12 +239,7 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,
return ret; return ret;
} }
tl_tmr = kzalloc(sizeof(struct tcm_loop_tmr), GFP_KERNEL); init_waitqueue_head(&tl_cmd->tl_tmr_wait);
if (!tl_tmr) {
pr_err("Unable to allocate memory for tl_tmr\n");
goto release;
}
init_waitqueue_head(&tl_tmr->tl_tmr_wait);
se_cmd = &tl_cmd->tl_se_cmd; se_cmd = &tl_cmd->tl_se_cmd;
se_tpg = &tl_tpg->tl_se_tpg; se_tpg = &tl_tpg->tl_se_tpg;
@ -257,7 +251,7 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,
DMA_NONE, TCM_SIMPLE_TAG, DMA_NONE, TCM_SIMPLE_TAG,
&tl_cmd->tl_sense_buf[0]); &tl_cmd->tl_sense_buf[0]);
rc = core_tmr_alloc_req(se_cmd, tl_tmr, tmr, GFP_KERNEL); rc = core_tmr_alloc_req(se_cmd, NULL, tmr, GFP_KERNEL);
if (rc < 0) if (rc < 0)
goto release; goto release;
@ -276,7 +270,7 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,
* tcm_loop_queue_tm_rsp() to wake us up. * tcm_loop_queue_tm_rsp() to wake us up.
*/ */
transport_generic_handle_tmr(se_cmd); transport_generic_handle_tmr(se_cmd);
wait_event(tl_tmr->tl_tmr_wait, atomic_read(&tl_tmr->tmr_complete)); wait_event(tl_cmd->tl_tmr_wait, atomic_read(&tl_cmd->tmr_complete));
/* /*
* The TMR LUN_RESET has completed, check the response status and * The TMR LUN_RESET has completed, check the response status and
* then release allocations. * then release allocations.
@ -287,7 +281,6 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,
transport_generic_free_cmd(se_cmd, 1); transport_generic_free_cmd(se_cmd, 1);
else else
kmem_cache_free(tcm_loop_cmd_cache, tl_cmd); kmem_cache_free(tcm_loop_cmd_cache, tl_cmd);
kfree(tl_tmr);
return ret; return ret;
} }
@ -669,14 +662,15 @@ static int tcm_loop_queue_status(struct se_cmd *se_cmd)
static void tcm_loop_queue_tm_rsp(struct se_cmd *se_cmd) static void tcm_loop_queue_tm_rsp(struct se_cmd *se_cmd)
{ {
struct se_tmr_req *se_tmr = se_cmd->se_tmr_req; struct tcm_loop_cmd *tl_cmd = container_of(se_cmd,
struct tcm_loop_tmr *tl_tmr = se_tmr->fabric_tmr_ptr; struct tcm_loop_cmd, tl_se_cmd);
/* /*
* The SCSI EH thread will be sleeping on se_tmr->tl_tmr_wait, go ahead * The SCSI EH thread will be sleeping on se_tmr->tl_tmr_wait, go ahead
* and wake up the wait_queue_head_t in tcm_loop_device_reset() * and wake up the wait_queue_head_t in tcm_loop_device_reset()
*/ */
atomic_set(&tl_tmr->tmr_complete, 1); atomic_set(&tl_cmd->tmr_complete, 1);
wake_up(&tl_tmr->tl_tmr_wait); wake_up(&tl_cmd->tl_tmr_wait);
} }
static void tcm_loop_aborted_task(struct se_cmd *se_cmd) static void tcm_loop_aborted_task(struct se_cmd *se_cmd)

7
drivers/target/loopback/tcm_loop.h
View file

@ -16,13 +16,10 @@ struct tcm_loop_cmd {
/* The TCM I/O descriptor that is accessed via container_of() */ /* The TCM I/O descriptor that is accessed via container_of() */
struct se_cmd tl_se_cmd; struct se_cmd tl_se_cmd;
struct work_struct work; struct work_struct work;
/* Sense buffer that will be mapped into outgoing status */
unsigned char tl_sense_buf[TRANSPORT_SENSE_BUFFER];
};
struct tcm_loop_tmr {
atomic_t tmr_complete; atomic_t tmr_complete;
wait_queue_head_t tl_tmr_wait; wait_queue_head_t tl_tmr_wait;
/* Sense buffer that will be mapped into outgoing status */
unsigned char tl_sense_buf[TRANSPORT_SENSE_BUFFER];
}; };
struct tcm_loop_nexus { struct tcm_loop_nexus {