[SCSI] scsi_dh_alua: fix deadlock in stpg_endio
authorJoseph Gruher <joseph.r.gruher@intel.com>
Wed, 5 Jan 2011 21:00:21 +0000 (16:00 -0500)
committerJames Bottomley <James.Bottomley@suse.de>
Mon, 24 Jan 2011 17:13:13 +0000 (11:13 -0600)
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>
drivers/scsi/device_handler/scsi_dh_alua.c

index afb1d058edbdfbff11eedbde6650b5129e1f2873..ba3c6491929f7f45a33517dbff9b22cedb5ce5fd 100644 (file)
@@ -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;