Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d309923 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Keith Busch
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
parent 5a1e5953

drivers/nvme/host/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -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;