Commit ed0f36bc authored by Joseph Gruher's avatar Joseph Gruher Committed by James Bottomley

[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: default avatarJoseph Gruher <joseph.r.gruher@intel.com>
Signed-off-by: default avatarIlgu Hong <ilgu.hong@promise.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 7c66e9a5
...@@ -285,7 +285,8 @@ static void stpg_endio(struct request *req, int error) ...@@ -285,7 +285,8 @@ static void stpg_endio(struct request *req, int error)
print_alua_state(h->state)); print_alua_state(h->state));
} }
done: done:
blk_put_request(req); req->end_io_data = NULL;
__blk_put_request(req->q, req);
if (h->callback_fn) { if (h->callback_fn) {
h->callback_fn(h->callback_data, err); h->callback_fn(h->callback_data, err);
h->callback_fn = h->callback_data = NULL; h->callback_fn = h->callback_data = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment