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/nvme/host/rdma.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/nvme/host/rdma.c')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index f383146e7d0f..f7ea19b45798 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1133,7 +1133,7 @@ static void nvme_rdma_unmap_data(struct nvme_rdma_queue *queue, WRITE ? DMA_TO_DEVICE : DMA_FROM_DEVICE); nvme_cleanup_cmd(rq); - sg_free_table_chained(&req->sg_table, true); + sg_free_table_chained(&req->sg_table, SG_CHUNK_SIZE); } static int nvme_rdma_set_sg_null(struct nvme_command *c) @@ -1248,7 +1248,8 @@ static int nvme_rdma_map_data(struct nvme_rdma_queue *queue, req->sg_table.sgl = req->first_sgl; ret = sg_alloc_table_chained(&req->sg_table, - blk_rq_nr_phys_segments(rq), req->sg_table.sgl); + blk_rq_nr_phys_segments(rq), req->sg_table.sgl, + SG_CHUNK_SIZE); if (ret) return -ENOMEM; @@ -1288,7 +1289,7 @@ out_unmap_sg: req->nents, rq_data_dir(rq) == WRITE ? DMA_TO_DEVICE : DMA_FROM_DEVICE); out_free_table: - sg_free_table_chained(&req->sg_table, true); + sg_free_table_chained(&req->sg_table, SG_CHUNK_SIZE); return ret; } |