diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-06-27 00:19:33 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-06-27 00:19:33 -0400 |
| commit | 893ca250edfcd0489a49446048aa0d900d6862fc (patch) | |
| tree | 834bd18586b204cce9177a8ba6f8f273f8fa1956 /drivers/scsi/pmcraid.c | |
| parent | baf23eddbf2a4ba9bf2bdb342686c71a8042e39b (diff) | |
| parent | 3e99b3b13a1fc8f7354edaee4c04f73a07faba69 (diff) | |
| download | linux-893ca250edfcd0489a49446048aa0d900d6862fc.tar.gz linux-893ca250edfcd0489a49446048aa0d900d6862fc.tar.bz2 linux-893ca250edfcd0489a49446048aa0d900d6862fc.zip | |
Merge branch '5.3/scsi-sg' into scsi-next
Diffstat (limited to 'drivers/scsi/pmcraid.c')
| -rw-r--r-- | drivers/scsi/pmcraid.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index e338d7a4f571..286cac59cb5f 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -3270,7 +3270,7 @@ static int pmcraid_copy_sglist( int direction ) { - struct scatterlist *scatterlist; + struct scatterlist *sg; void *kaddr; int bsize_elem; int i; @@ -3279,10 +3279,10 @@ static int pmcraid_copy_sglist( /* Determine the actual number of bytes per element */ bsize_elem = PAGE_SIZE * (1 << sglist->order); - scatterlist = sglist->scatterlist; + sg = sglist->scatterlist; - for (i = 0; i < (len / bsize_elem); i++, buffer += bsize_elem) { - struct page *page = sg_page(&scatterlist[i]); + for (i = 0; i < (len / bsize_elem); i++, sg = sg_next(sg), buffer += bsize_elem) { + struct page *page = sg_page(sg); kaddr = kmap(page); if (direction == DMA_TO_DEVICE) @@ -3297,11 +3297,11 @@ static int pmcraid_copy_sglist( return -EFAULT; } - scatterlist[i].length = bsize_elem; + sg->length = bsize_elem; } if (len % bsize_elem) { - struct page *page = sg_page(&scatterlist[i]); + struct page *page = sg_page(sg); kaddr = kmap(page); @@ -3312,7 +3312,7 @@ static int pmcraid_copy_sglist( kunmap(page); - scatterlist[i].length = len % bsize_elem; + sg->length = len % bsize_elem; } if (rc) { |