Re: 2.6.24-git: kmap_atomic() WARN_ON()

Jeff Garzik
2008-02-25T23:19:30Z

[-- Attachment #1: Type: text/plain, Size: 83 bytes --]

Welcome to test this... (attached, not tested nor even compiled, really)

Jeff

[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 1078 bytes --]

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 0562b0a..7b1f1ee 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1694,12 +1694,17 @@ void ata_scsi_rbuf_fill(struct ata_scsi_args *args,
u8 *rbuf;
unsigned int buflen, rc;
struct scsi_cmnd *cmd = args->cmd;
+ unsigned long flags;
+
+ local_irq_save(flags);

buflen = ata_scsi_rbuf_get(cmd, &rbuf);
memset(rbuf, 0, buflen);
rc = actor(args, rbuf, buflen);
ata_scsi_rbuf_put(cmd, rbuf);

+ local_irq_restore(flags);
+
if (rc == 0)
cmd->result = SAM_STAT_GOOD;
args->done(cmd);
@@ -2473,6 +2478,9 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)
if ((scsicmd[0] == INQUIRY) && ((scsicmd[1] & 0x03) == 0)) {
u8 *buf = NULL;
unsigned int buflen;
+ unsigned long flags;
+
+ local_irq_save(flags);

buflen = ata_scsi_rbuf_get(cmd, &buf);

@@ -2490,6 +2498,8 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)
}

ata_scsi_rbuf_put(cmd, buf);
+
+ local_irq_restore(flags);
}

cmd->result = SAM_STAT_GOOD;