diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-02-22 16:24:09 +0100 |
|---|---|---|
| committer | Keith Busch <keith.busch@intel.com> | 2018-02-22 09:45:32 +0100 |
| commit | 0d30992395b1ed0e006960de1651b44cd51be791 (patch) | |
| tree | 1b91a15093945138669b37c473f14cf4dde0d533 | |
| parent | nvme-fabrics: don't check for non-NULL module in nvmf_register_transport (diff) | |
| download | linux-0d30992395b1ed0e006960de1651b44cd51be791.tar.xz linux-0d30992395b1ed0e006960de1651b44cd51be791.zip | |
nvme-rdma: use blk_rq_payload_bytes instead of blk_rq_bytes
blk_rq_bytes does the wrong thing for special payloads like discards and
might cause the driver to not set up a SGL.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
| -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 2bc059f7d73c..acc9eb21c242 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; |