diff options
author | Joseph Gruher <joseph.r.gruher@intel.com> | 2011-01-05 16:00:21 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-01-24 12:13:13 -0500 |
commit | ed0f36bc5719b25659b637f80ceea85494b84502 (patch) | |
tree | 55e69f3c8d5f19bc7676f33ca5aeb231eb46e8a0 /drivers/scsi/device_handler/scsi_dh_alua.c | |
parent | 7c66e9a5e6b0459c619562c5ad321071e2767faa (diff) |
[SCSI] scsi_dh_alua: fix deadlock in stpg_endio
The use of blk_execute_rq_nowait() implies __blk_put_request() is needed
in stpg_endio() rather than blk_put_request() -- blk_finish_request() is
called with queue lock already held.
Signed-off-by: Joseph Gruher <joseph.r.gruher@intel.com>
Signed-off-by: Ilgu Hong <ilgu.hong@promise.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@kernel.org
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/device_handler/scsi_dh_alua.c')
-rw-r--r-- | drivers/scsi/device_handler/scsi_dh_alua.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index afb1d058edb..ba3c6491929 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c | |||
@@ -285,7 +285,8 @@ static void stpg_endio(struct request *req, int error) | |||
285 | print_alua_state(h->state)); | 285 | print_alua_state(h->state)); |
286 | } | 286 | } |
287 | done: | 287 | done: |
288 | blk_put_request(req); | 288 | req->end_io_data = NULL; |
289 | __blk_put_request(req->q, req); | ||
289 | if (h->callback_fn) { | 290 | if (h->callback_fn) { |
290 | h->callback_fn(h->callback_data, err); | 291 | h->callback_fn(h->callback_data, err); |
291 | h->callback_fn = h->callback_data = NULL; | 292 | h->callback_fn = h->callback_data = NULL; |