https://bugzilla.kernel.org/show_bug.cgi?id=16010 Ken Stailey <kstailey@xxxxxxxxx> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kstailey@xxxxxxxxx --- Comment #3 from Ken Stailey <kstailey@xxxxxxxxx> 2010-07-12 15:30:29 --- @dujun - Thanks It's actually a double underscore: __data_len diff against 4.22.00.00-2 --- mptsas.c.DIST 2009-11-12 05:17:05.000000000 -0500 +++ mptsas.c 2010-07-12 11:14:41.480493720 -0400 @@ -2754,8 +2754,8 @@ /* do we need to support multiple segments? */ if (req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt > 1) { printk(MYIOC_s_ERR_FMT "%s: multiple segments req %u %u, rsp %u %u\n", - ioc->name, __func__, req->bio->bi_vcnt, req->data_len, - rsp->bio->bi_vcnt, rsp->data_len); + ioc->name, __func__, req->bio->bi_vcnt, req->__data_len, + rsp->bio->bi_vcnt, rsp->__data_len); return -EINVAL; } @@ -2772,7 +2772,7 @@ smpreq = (SmpPassthroughRequest_t *)mf; memset(smpreq, 0, sizeof(*smpreq)); - smpreq->RequestDataLength = cpu_to_le16(req->data_len - 4); + smpreq->RequestDataLength = cpu_to_le16(req->__data_len - 4); smpreq->Function = MPI_FUNCTION_SMP_PASSTHROUGH; if (rphy) @@ -2802,10 +2802,10 @@ flagsLength = flagsLength << MPI_SGE_FLAGS_SHIFT; - flagsLength |= (req->data_len - 4); + flagsLength |= (req->__data_len - 4); dma_addr_out = pci_map_single(ioc->pcidev, bio_data(req->bio), - req->data_len, PCI_DMA_BIDIRECTIONAL); + req->__data_len, PCI_DMA_BIDIRECTIONAL); if (!dma_addr_out) goto put_mf; ioc->add_sge(psge, flagsLength, dma_addr_out); @@ -2818,9 +2818,9 @@ MPI_SGE_FLAGS_END_OF_BUFFER; flagsLength = flagsLength << MPI_SGE_FLAGS_SHIFT; - flagsLength |= rsp->data_len + 4; + flagsLength |= rsp->__data_len + 4; dma_addr_in = pci_map_single(ioc->pcidev, bio_data(rsp->bio), - rsp->data_len, PCI_DMA_BIDIRECTIONAL); + rsp->__data_len, PCI_DMA_BIDIRECTIONAL); if (!dma_addr_in) goto out_unmap; @@ -2851,8 +2851,8 @@ smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply; memcpy(req->sense, smprep, sizeof(*smprep)); req->sense_len = sizeof(*smprep); - req->data_len = 0; - rsp->data_len -= smprep->ResponseDataLength; + req->__data_len = 0; + rsp->__data_len -= smprep->ResponseDataLength; } else { printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n", @@ -2861,10 +2861,10 @@ } out_unmap: if (dma_addr_out) - pci_unmap_single(ioc->pcidev, dma_addr_out, req->data_len, + pci_unmap_single(ioc->pcidev, dma_addr_out, req->__data_len, PCI_DMA_BIDIRECTIONAL); if (dma_addr_in) - pci_unmap_single(ioc->pcidev, dma_addr_in, rsp->data_len, + pci_unmap_single(ioc->pcidev, dma_addr_in, rsp->__data_len, PCI_DMA_BIDIRECTIONAL); put_mf: if (mf) -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
