diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-02-14 16:25:54 -0800 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2017-02-20 14:37:19 -0800 |
| commit | 51ec502a32665fed66c7f03799ede4023b212536 (patch) | |
| tree | 66a18d81d892bbd9c3b0802df537eef8fc4b8f70 /drivers/target | |
| parent | e3b88ee95b4e4bf3e9729a4695d695b9c7c296c8 (diff) | |
| download | linux-stable-51ec502a32665fed66c7f03799ede4023b212536.tar.gz linux-stable-51ec502a32665fed66c7f03799ede4023b212536.tar.bz2 linux-stable-51ec502a32665fed66c7f03799ede4023b212536.zip | |
target: Delete tmr from list before processing
This patch does an explicit list_del_init(tmr->tmr_list) in
core_tmr_drain_tmr_list() before starting processing of
outstanding TMRs to abort, instead of explicitly checking
which TMR descriptor matches the caller.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: David Disseldorp <ddiss@suse.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_tmr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index 311dc3c2f1dc..a806d9bca3d2 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c @@ -215,13 +215,8 @@ static void core_tmr_drain_tmr_list( * LUN_RESET tmr.. */ spin_lock_irqsave(&dev->se_tmr_lock, flags); + list_del_init(&tmr->tmr_list); list_for_each_entry_safe(tmr_p, tmr_pp, &dev->dev_tmr_list, tmr_list) { - /* - * Allow the received TMR to return with FUNCTION_COMPLETE. - */ - if (tmr_p == tmr) - continue; - cmd = tmr_p->task_cmd; if (!cmd) { pr_err("Unable to locate struct se_cmd for TMR\n"); |