From 0004d0fec4c59b678241a188f00626b0fef8a40c Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Tue, 18 Sep 2007 17:46:12 +0200 Subject: [PATCH] --- yaml --- r: 68095 b: refs/heads/master c: e10b8c3f5f23188e065b1845ba732570eca007fe h: refs/heads/master i: 68093: bf42e74ed080804680ffc78928532e67eee240ef 68091: a692fdd916dfe1b076566c28720d5c3e2e88c542 68087: f25202c924f92bd81988d4af9570cc38b530fa76 68079: ea4c3cb92ce1b60aa7a4094f4f1778f6e7f06211 68063: dbf26bffb33420774deba6e8c73fd05f1c9fba21 68031: 218e50d4c8c3607aec46adbdc46199ab44e7f382 67967: a3690ac9b5efc3113786e9e12351fb8ece5e7491 67839: 132368dd610ddc8b17cbdeb1bc3bab7e3faf9439 67583: 7d723b3957ba0fa14ccd60f00332d283f39b1ac2 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 31 +++++++++---------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index a993fa7e8cdf..1fa7a81cc6dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2a84f47899d1efc24fa610696f7b793692279c7 +refs/heads/master: e10b8c3f5f23188e065b1845ba732570eca007fe diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index f0f586b56c20..598ef1018e19 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/drivers/ata/libata-scsi.c @@ -450,13 +450,8 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev, qc->scsicmd = cmd; qc->scsidone = done; - if (cmd->use_sg) { - qc->__sg = (struct scatterlist *) cmd->request_buffer; - qc->n_elem = cmd->use_sg; - } else if (cmd->request_bufflen) { - qc->__sg = &qc->sgent; - qc->n_elem = 1; - } + qc->__sg = (struct scatterlist *) cmd->request_buffer; + qc->n_elem = cmd->use_sg; } else { cmd->result = (DID_OK << 16) | (QUEUE_FULL << 1); done(cmd); @@ -1504,11 +1499,7 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, goto err_did; } - if (cmd->use_sg) - ata_sg_init(qc, cmd->request_buffer, cmd->use_sg); - else - ata_sg_init_one(qc, cmd->request_buffer, - cmd->request_bufflen); + ata_sg_init(qc, cmd->request_buffer, cmd->use_sg); qc->dma_dir = cmd->sc_data_direction; } @@ -1562,15 +1553,14 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out) u8 *buf; unsigned int buflen; - if (cmd->use_sg) { - struct scatterlist *sg; + struct scatterlist *sg = (struct scatterlist *) cmd->request_buffer; - sg = (struct scatterlist *) cmd->request_buffer; + if (sg) { buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset; buflen = sg->length; } else { - buf = cmd->request_buffer; - buflen = cmd->request_bufflen; + buf = NULL; + buflen = 0; } *buf_out = buf; @@ -1590,12 +1580,9 @@ 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) { - if (cmd->use_sg) { - struct scatterlist *sg; - - sg = (struct scatterlist *) cmd->request_buffer; + struct scatterlist *sg = (struct scatterlist *) cmd->request_buffer; + if (sg) kunmap_atomic(buf - sg->offset, KM_IRQ0); - } } /**