diff options
author | Bart Van Assche <bvanassche@acm.org> | 2014-06-02 11:50:52 +0200 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-07-17 22:07:28 +0200 |
commit | fcc95a763444017288b318d48367098850c23c0d (patch) | |
tree | b0944747d52123c4c690998a5d852d5a2ad04897 /drivers/scsi/sg.c | |
parent | 89fb4cd1f717a871ef79fa7debbe840e3225cd54 (diff) | |
download | op-kernel-dev-fcc95a763444017288b318d48367098850c23c0d.zip op-kernel-dev-fcc95a763444017288b318d48367098850c23c0d.tar.gz |
scsi: remove two cancel_delayed_work() calls from the mid-layer
scsi_put_command() is either invoked before blk_start_request() or
after block layer processing has completed. scsi_cmnd.abort_work
is scheduled from inside the SCSI timeout handler. The block layer
guarantees that either the regular completion handler
(softirq_done_fn()) or the timeout handler (rq_timed_out_fn()) is
invoked but not both. This means that scsi_put_command() is never
invoked while abort_work is scheduled. Hence remove the
cancel_delayed_work() call from scsi_put_command().
Similarly, scsi_abort_command() is only invoked from the SCSI
timeout handler. If scsi_abort_command() is invoked for a SCSI
command with the SCSI_EH_ABORT_SCHEDULED flag set this means that
scmd_eh_abort_handler() has already invoked scsi_queue_insert() and
hence that scsi_cmnd.abort_work is no longer pending. Hence also
remove the cancel_delayed_work() call from scsi_abort_command().
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/sg.c')
0 files changed, 0 insertions, 0 deletions