From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Thu, 3 Jul 2008 16:31:55 +0000 (-0500)
Subject: [SCSI] fix locking in host use of blk_plug_device()
X-Git-Tag: v2.6.27-rc1~1059^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2476b4d0426e1d6d4a42b2f7ae08f668b2cfe510;p=linux-2.6-omap-h63xx.git

[SCSI] fix locking in host use of blk_plug_device()

scsi_lib.c:scsi_host_queue_ready() plugs the device with incorrect
locking.  It should actually have the queue lock held, but it's
holding the host lock.  Fix this by eliminating the call.  The host
ready has no need to plug the queue because if it returns 0 in
scsi_request_function control transfers to not_ready which acquires
the queue lock and plugs the device if its at zero depth.

Reported-by: Elias Oltmanns <eo@nebensachen.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index aa8d5de5883..0451903452e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1328,7 +1328,6 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
 				printk("scsi%d unblocking host at zero depth\n",
 					shost->host_no));
 		} else {
-			blk_plug_device(q);
 			return 0;
 		}
 	}