[BK PATCH] (resend) 2.6.x libata fix
DORMANTno replies
From: Jeff Garzik <hidden>
Date: 2004-10-27 06:28:05
Re-sending mainly because I accidentally blew away the upstream tree. Anyone who keeps a local clone of the libata-2.6 queue, please erase and re-clone. Thanks. Please do a bk pull bk://gkernel.bkbits.net/libata-2.6 This will update the following files: drivers/scsi/libata-scsi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) through these ChangeSets: [off-list ref] (04/10/26 1.2067.4.2) [libata] use kunmap_atomic() correctly diff -Nru a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/libata-scsi.c 2004-10-27 02:24:55 -04:00
+++ b/drivers/scsi/libata-scsi.c 2004-10-27 02:24:55 -04:00@@ -742,13 +742,13 @@ * spin_lock_irqsave(host_set lock) */ -static inline void ata_scsi_rbuf_put(struct scsi_cmnd *cmd) +static inline void ata_scsi_rbuf_put(struct scsi_cmnd *cmd, u8 *buf) { if (cmd->use_sg) { struct scatterlist *sg; sg = (struct scatterlist *) cmd->request_buffer; - kunmap_atomic(sg->page, KM_USER0); + kunmap_atomic(buf - sg->offset, KM_USER0); } }
@@ -778,7 +778,7 @@ buflen = ata_scsi_rbuf_get(cmd, &rbuf); memset(rbuf, 0, buflen); rc = actor(args, rbuf, buflen); - ata_scsi_rbuf_put(cmd); + ata_scsi_rbuf_put(cmd, rbuf); if (rc) ata_bad_cdb(cmd, args->done);
@@ -1264,7 +1264,7 @@ buflen = ata_scsi_rbuf_get(cmd, &buf); buf[2] = 0x5; buf[3] = (buf[3] & 0xf0) | 2; - ata_scsi_rbuf_put(cmd); + ata_scsi_rbuf_put(cmd, buf); } cmd->result = SAM_STAT_GOOD; }