diff options
| author | Jens Axboe | 2018-02-28 20:18:58 +0100 |
|---|---|---|
| committer | Jens Axboe | 2018-02-28 20:18:58 +0100 |
| commit | 468f098734ab095b72d8af26bcd4bcb2ed31a3be (patch) | |
| tree | 657b08428562785483129b470c8017b70c38c1aa /drivers/nvme/host/rdma.c | |
| parent | nbd: fix return value in error handling path (diff) | |
| parent | nvmet: fix PSDT field check in command format (diff) | |
| download | kernel-qcow2-linux-468f098734ab095b72d8af26bcd4bcb2ed31a3be.tar.gz kernel-qcow2-linux-468f098734ab095b72d8af26bcd4bcb2ed31a3be.tar.xz kernel-qcow2-linux-468f098734ab095b72d8af26bcd4bcb2ed31a3be.zip | |
Merge branch 'for-jens' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Keith for 4.16-rc.
* 'for-jens' of git://git.infradead.org/nvme:
nvmet: fix PSDT field check in command format
nvme-multipath: fix sysfs dangerously created links
nvme-pci: Fix nvme queue cleanup if IRQ setup fails
nvmet-loop: use blk_rq_payload_bytes for sgl selection
nvme-rdma: use blk_rq_payload_bytes instead of blk_rq_bytes
nvme-fabrics: don't check for non-NULL module in nvmf_register_transport
Diffstat (limited to 'drivers/nvme/host/rdma.c')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 3a51ed50eff2..4d84a73ee12d 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1051,7 +1051,7 @@ static void nvme_rdma_unmap_data(struct nvme_rdma_queue *queue, struct nvme_rdma_device *dev = queue->device; struct ib_device *ibdev = dev->dev; - if (!blk_rq_bytes(rq)) + if (!blk_rq_payload_bytes(rq)) return; if (req->mr) { @@ -1166,7 +1166,7 @@ static int nvme_rdma_map_data(struct nvme_rdma_queue *queue, c->common.flags |= NVME_CMD_SGL_METABUF; - if (!blk_rq_bytes(rq)) + if (!blk_rq_payload_bytes(rq)) return nvme_rdma_set_sg_null(c); req->sg_table.sgl = req->first_sgl; |