diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2011-01-25 11:52:17 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-12 10:31:04 -0600 |
| commit | 7a1e9d829f8bd821466c5ea834ad6f378740d2be (patch) | |
| tree | 1952712cb6970830a9deccf30eaa32c33178a300 /drivers/scsi/device_handler | |
| parent | 98cb7e4413d189cd2b54daf993a4667d9788c0bb (diff) | |
| download | linux-stable-7a1e9d829f8bd821466c5ea834ad6f378740d2be.tar.gz | |
[SCSI] scsi_dh_hp_sw: fix deadlock in start_stop_endio
The use of blk_execute_rq_nowait() implies __blk_put_request() is needed
in start_stop_endio() rather than blk_put_request() --
blk_finish_request() is called with queue lock already held.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/device_handler')
| -rw-r--r-- | drivers/scsi/device_handler/scsi_dh_hp_sw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c index e3916641e627..d0363c8fa348 100644 --- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c +++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c @@ -225,7 +225,8 @@ static void start_stop_endio(struct request *req, int error) } } done: - blk_put_request(req); + req->end_io_data = NULL; + __blk_put_request(req->q, req); if (h->callback_fn) { h->callback_fn(h->callback_data, err); h->callback_fn = h->callback_data = NULL; |