This is a note to let you know that I've just added the patch titled

    [SCSI] scsi_dh_alua: fix deadlock in stpg_endio

to the 2.6.38-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     scsi_dh_alua-fix-deadlock-in-stpg_endio.patch
and it can be found in the queue-2.6.38 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From ed0f36bc5719b25659b637f80ceea85494b84502 Mon Sep 17 00:00:00 2001
From: Joseph Gruher <[email protected]>
Date: Wed, 5 Jan 2011 16:00:21 -0500
Subject: [SCSI] scsi_dh_alua: fix deadlock in stpg_endio

From: Joseph Gruher <[email protected]>

commit ed0f36bc5719b25659b637f80ceea85494b84502 upstream.

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]>
Signed-off-by: James Bottomley <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/scsi/device_handler/scsi_dh_alua.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- 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 *r
                            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;


Patches currently in stable-queue which might be from [email protected] 
are

queue-2.6.38/scsi_dh_alua-fix-deadlock-in-stpg_endio.patch

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to