Commit f15872c5 authored by Israel Rukshin's avatar Israel Rukshin Committed by Sagi Grimberg
Browse files

nvme-fc: Use rq_dma_dir macro 



Remove code duplication.

Signed-off-by: default avatarIsrael Rukshin <israelr@mellanox.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent f2fa006f

drivers/nvme/host/fc.c

+2 −5
Original line number Diff line number Diff line
@@ -2108,7 +2108,6 @@ nvme_fc_map_data(struct nvme_fc_ctrl *ctrl, struct request *rq, 
		struct nvme_fc_fcp_op *op)

{

	struct nvmefc_fcp_req *freq = &op->fcp_req;

	enum dma_data_direction dir;

	int ret;



	freq->sg_cnt = 0;
@@ -2125,9 +2124,8 @@ nvme_fc_map_data(struct nvme_fc_ctrl *ctrl, struct request *rq, 


	op->nents = blk_rq_map_sg(rq->q, rq, freq->sg_table.sgl);

	WARN_ON(op->nents > blk_rq_nr_phys_segments(rq));

	dir = (rq_data_dir(rq) == WRITE) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;

	freq->sg_cnt = fc_dma_map_sg(ctrl->lport->dev, freq->sg_table.sgl,

				op->nents, dir);

				op->nents, rq_dma_dir(rq));

	if (unlikely(freq->sg_cnt <= 0)) {

		sg_free_table_chained(&freq->sg_table, SG_CHUNK_SIZE);

		freq->sg_cnt = 0;
@@ -2150,8 +2148,7 @@ nvme_fc_unmap_data(struct nvme_fc_ctrl *ctrl, struct request *rq, 
		return;



	fc_dma_unmap_sg(ctrl->lport->dev, freq->sg_table.sgl, op->nents,

				((rq_data_dir(rq) == WRITE) ?

					DMA_TO_DEVICE : DMA_FROM_DEVICE));

			rq_dma_dir(rq));



	nvme_cleanup_cmd(rq);