From: Mike Snitzer <snitzer@redhat.com>
Date: Tue, 25 Jan 2011 16:52:17 +0000 (-0500)
Subject: [SCSI] scsi_dh_hp_sw: fix deadlock in start_stop_endio
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7a1e9d829f8bd821466c5ea834ad6f378740d2be;p=linux-beck.git

[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>
---

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;