lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge of 'misc-fixes' branch from

Browse Source 
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
This commit is contained in:
Linus Torvalds
2005-05-26 10:02:30 -07:00
parent 284e423811 32529e0128
commit cdbbde14cb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/scsi/libata-core.c
View File

@@ -2071,7 +2071,7 @@ void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
sg = qc->sg; sg = qc->sg;
sg->page = virt_to_page(buf); sg->page = virt_to_page(buf);
sg->offset = (unsigned long) buf & ~PAGE_MASK; sg->offset = (unsigned long) buf & ~PAGE_MASK;
sg_dma_len(sg) = buflen; sg->length = buflen;
} }
void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg, void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
@@ -2101,11 +2101,12 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
dma_addr_t dma_address; dma_addr_t dma_address;
dma_address = dma_map_single(ap->host_set->dev, qc->buf_virt, dma_address = dma_map_single(ap->host_set->dev, qc->buf_virt,
sg_dma_len(sg), dir); sg->length, dir);
if (dma_mapping_error(dma_address)) if (dma_mapping_error(dma_address))
return -1; return -1;
sg_dma_address(sg) = dma_address; sg_dma_address(sg) = dma_address;
sg_dma_len(sg) = sg->length;
DPRINTK("mapped buffer of %d bytes for %s\n", sg_dma_len(sg), DPRINTK("mapped buffer of %d bytes for %s\n", sg_dma_len(sg),
qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read"); qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
@@ -2310,7 +2311,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
qc->cursect++; qc->cursect++;
qc->cursg_ofs++; qc->cursg_ofs++;
if ((qc->cursg_ofs * ATA_SECT_SIZE) == sg_dma_len(&sg[qc->cursg])) { if ((qc->cursg_ofs * ATA_SECT_SIZE) == (&sg[qc->cursg])->length) {
qc->cursg++; qc->cursg++;
qc->cursg_ofs = 0; qc->cursg_ofs = 0;
} }
@@ -2347,7 +2348,7 @@ next_page:
page = nth_page(page, (offset >> PAGE_SHIFT)); page = nth_page(page, (offset >> PAGE_SHIFT));
offset %= PAGE_SIZE; offset %= PAGE_SIZE;
count = min(sg_dma_len(sg) - qc->cursg_ofs, bytes); count = min(sg->length - qc->cursg_ofs, bytes);
/* don't cross page boundaries */ /* don't cross page boundaries */
count = min(count, (unsigned int)PAGE_SIZE - offset); count = min(count, (unsigned int)PAGE_SIZE - offset);
@@ -2358,7 +2359,7 @@ next_page:
qc->curbytes += count; qc->curbytes += count;
qc->cursg_ofs += count; qc->cursg_ofs += count;
if (qc->cursg_ofs == sg_dma_len(sg)) { if (qc->cursg_ofs == sg->length) {
qc->cursg++; qc->cursg++;
qc->cursg_ofs = 0; qc->cursg_ofs = 0;
} }
@@ -2371,7 +2372,7 @@ next_page:
kunmap(page); kunmap(page);
if (bytes) { if (bytes) {
if (qc->cursg_ofs < sg_dma_len(sg)) if (qc->cursg_ofs < sg->length)
goto next_page; goto next_page;
goto next_sg; goto next_sg;
} }