lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

target: simplify target_check_cdb_and_preempt

Browse Source 
- rename to target_check_cdb_and_preempt
- use non-safe list_for_each_entry
- move common check into callee (simplifying callers)

Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Jörn Engel
2011-11-24 02:05:12 +01:00
committed by Nicholas Bellinger
parent c165f69c2c
commit feae85644f
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/target/target_core_tmr.c
View File

@@ -100,15 +100,15 @@ static void core_tmr_handle_tas_abort(
transport_cmd_finish_abort(cmd, 0); transport_cmd_finish_abort(cmd, 0);
} }
static int core_scsi3_check_cdb_abort_and_preempt( static int target_check_cdb_and_preempt(struct list_head *list,
struct list_head *preempt_and_abort_list, struct se_cmd *cmd)
struct se_cmd *cmd)
{ {
struct t10_pr_registration *pr_reg, *pr_reg_tmp; struct t10_pr_registration *reg;
list_for_each_entry_safe(pr_reg, pr_reg_tmp, preempt_and_abort_list, if (!list)
pr_reg_abort_list) { return 0;
if (pr_reg->pr_res_key == cmd->pr_res_key) list_for_each_entry(reg, list, pr_reg_abort_list) {
if (reg->pr_res_key == cmd->pr_res_key)
return 0; return 0;
} }
@@ -146,9 +146,7 @@ static void core_tmr_drain_tmr_list(
* parameter (eg: for PROUT PREEMPT_AND_ABORT service action * parameter (eg: for PROUT PREEMPT_AND_ABORT service action
* skip non regisration key matching TMRs. * skip non regisration key matching TMRs.
*/ */
if (preempt_and_abort_list && if (target_check_cdb_and_preempt(preempt_and_abort_list, cmd))
(core_scsi3_check_cdb_abort_and_preempt(
preempt_and_abort_list, cmd) != 0))
continue; continue;
spin_lock(&cmd->t_state_lock); spin_lock(&cmd->t_state_lock);
@@ -225,9 +223,7 @@ static void core_tmr_drain_task_list(
* For PREEMPT_AND_ABORT usage, only process commands * For PREEMPT_AND_ABORT usage, only process commands
* with a matching reservation key. * with a matching reservation key.
*/ */
if (preempt_and_abort_list && if (target_check_cdb_and_preempt(preempt_and_abort_list, cmd))
(core_scsi3_check_cdb_abort_and_preempt(
preempt_and_abort_list, cmd) != 0))
continue; continue;
/* /*
* Not aborting PROUT PREEMPT_AND_ABORT CDB.. * Not aborting PROUT PREEMPT_AND_ABORT CDB..
@@ -335,9 +331,7 @@ static void core_tmr_drain_cmd_list(
* For PREEMPT_AND_ABORT usage, only process commands * For PREEMPT_AND_ABORT usage, only process commands
* with a matching reservation key. * with a matching reservation key.
*/ */
if (preempt_and_abort_list && if (target_check_cdb_and_preempt(preempt_and_abort_list, cmd))
(core_scsi3_check_cdb_abort_and_preempt(
preempt_and_abort_list, cmd) != 0))
continue; continue;
/* /*
* Not aborting PROUT PREEMPT_AND_ABORT CDB.. * Not aborting PROUT PREEMPT_AND_ABORT CDB..