commit: ed0f36bc5719b25659b637f80ceea85494b84502 From: Joseph Gruher <[email protected]> Date: Wed, 5 Jan 2011 16:00:21 -0500 Subject: [PATCH] [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 <[email protected]> Signed-off-by: Ilgu Hong <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Cc: [email protected] Signed-off-by: James Bottomley <[email protected]> --- 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 afb1d05..ba3c649 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) print_alua_state(h->state)); } 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; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
