libata-scsi: convert to use the data buffer accessors
simple search-and-replace of direct scsi_cmnd access to use the data buffer accessors. Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
e10b8c3f5f
commit
7120165cf3
@ -450,8 +450,8 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
|
||||
qc->scsicmd = cmd;
|
||||
qc->scsidone = done;
|
||||
|
||||
qc->__sg = (struct scatterlist *) cmd->request_buffer;
|
||||
qc->n_elem = cmd->use_sg;
|
||||
qc->__sg = scsi_sglist(cmd);
|
||||
qc->n_elem = scsi_sg_count(cmd);
|
||||
} else {
|
||||
cmd->result = (DID_OK << 16) | (QUEUE_FULL << 1);
|
||||
done(cmd);
|
||||
@ -1493,13 +1493,13 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
|
||||
/* data is present; dma-map it */
|
||||
if (cmd->sc_data_direction == DMA_FROM_DEVICE ||
|
||||
cmd->sc_data_direction == DMA_TO_DEVICE) {
|
||||
if (unlikely(cmd->request_bufflen < 1)) {
|
||||
if (unlikely(scsi_bufflen(cmd) < 1)) {
|
||||
ata_dev_printk(dev, KERN_WARNING,
|
||||
"WARNING: zero len r/w req\n");
|
||||
goto err_did;
|
||||
}
|
||||
|
||||
ata_sg_init(qc, cmd->request_buffer, cmd->use_sg);
|
||||
ata_sg_init(qc, scsi_sglist(cmd), scsi_sg_count(cmd));
|
||||
|
||||
qc->dma_dir = cmd->sc_data_direction;
|
||||
}
|
||||
@ -1553,7 +1553,7 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out)
|
||||
u8 *buf;
|
||||
unsigned int buflen;
|
||||
|
||||
struct scatterlist *sg = (struct scatterlist *) cmd->request_buffer;
|
||||
struct scatterlist *sg = scsi_sglist(cmd);
|
||||
|
||||
if (sg) {
|
||||
buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
|
||||
@ -1580,7 +1580,7 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out)
|
||||
|
||||
static inline void ata_scsi_rbuf_put(struct scsi_cmnd *cmd, u8 *buf)
|
||||
{
|
||||
struct scatterlist *sg = (struct scatterlist *) cmd->request_buffer;
|
||||
struct scatterlist *sg = scsi_sglist(cmd);
|
||||
if (sg)
|
||||
kunmap_atomic(buf - sg->offset, KM_IRQ0);
|
||||
}
|
||||
@ -2383,7 +2383,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
|
||||
}
|
||||
|
||||
qc->tf.command = ATA_CMD_PACKET;
|
||||
qc->nbytes = scmd->request_bufflen;
|
||||
qc->nbytes = scsi_bufflen(scmd);
|
||||
|
||||
/* check whether ATAPI DMA is safe */
|
||||
if (!using_pio && ata_check_atapi_dma(qc))
|
||||
@ -2633,7 +2633,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
|
||||
case ATA_CMD_WRITE_LONG_ONCE:
|
||||
if (tf->protocol != ATA_PROT_PIO || tf->nsect != 1)
|
||||
goto invalid_fld;
|
||||
qc->sect_size = scmd->request_bufflen;
|
||||
qc->sect_size = scsi_bufflen(scmd);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2663,7 +2663,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
|
||||
* TODO: find out if we need to do more here to
|
||||
* cover scatter/gather case.
|
||||
*/
|
||||
qc->nbytes = scmd->request_bufflen;
|
||||
qc->nbytes = scsi_bufflen(scmd);
|
||||
|
||||
/* request result TF */
|
||||
qc->flags |= ATA_QCFLAG_RESULT_TF;
|
||||
|
Loading…
Reference in New Issue
Block a user