From: Andrew Morton <akpm@osdl.org>
Date: Tue, 6 Feb 2007 00:39:03 +0000 (-0800)
Subject: [SCSI] scsi_kmap_atomic_sg(): check that local irqs are disabled
X-Git-Tag: v2.6.21-rc1~274^2~230^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22cfefb56b53103a99908ec63311e61c217eaffe;p=linux-2.6

[SCSI] scsi_kmap_atomic_sg(): check that local irqs are disabled

The KM_BIO_SRC_IRQ kmap slot must be taken with local irqs disabled.  Add a
check into scsi for this.

Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 503f09c2f0..0f9b6c2754 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2250,6 +2250,8 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
 	size_t sg_len = 0, len_complete = 0;
 	struct page *page;
 
+	WARN_ON(!irqs_disabled());
+
 	for (i = 0; i < sg_count; i++) {
 		len_complete = sg_len; /* Complete sg-entries */
 		sg_len += sg[i].length;