linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bart Van Assche <bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
To: Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>,
	Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>,
	Alex Estrin <alex.estrin-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
	"linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH v3 06/21] IB/srpt: Introduce target_reverse_dma_direction()
Date: Thu, 4 Feb 2016 14:48:06 -0800	[thread overview]
Message-ID: <56B3D526.9000103@sandisk.com> (raw)
In-Reply-To: <56B3D453.7030409-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>

Use the function target_reverse_dma_direction() instead of
reimplementing it.

Signed-off-by: Bart Van Assche <bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
Reviewed-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
Reviewed-by: Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Cc: Alex Estrin <alex.estrin-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 drivers/infiniband/ulp/srpt/ib_srpt.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index bd98efc..c50f05c 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -96,19 +96,6 @@ static int srpt_queue_status(struct se_cmd *cmd);
 static void srpt_recv_done(struct ib_cq *cq, struct ib_wc *wc);
 static void srpt_send_done(struct ib_cq *cq, struct ib_wc *wc);
 
-/**
- * opposite_dma_dir() - Swap DMA_TO_DEVICE and DMA_FROM_DEVICE.
- */
-static inline
-enum dma_data_direction opposite_dma_dir(enum dma_data_direction dir)
-{
-	switch (dir) {
-	case DMA_TO_DEVICE:	return DMA_FROM_DEVICE;
-	case DMA_FROM_DEVICE:	return DMA_TO_DEVICE;
-	default:		return dir;
-	}
-}
-
 static enum rdma_ch_state
 srpt_set_ch_state(struct srpt_rdma_ch *ch, enum rdma_ch_state new_state)
 {
@@ -1049,7 +1036,7 @@ static void srpt_unmap_sg_to_ib_sge(struct srpt_rdma_ch *ch,
 		dir = ioctx->cmd.data_direction;
 		BUG_ON(dir == DMA_NONE);
 		ib_dma_unmap_sg(ch->sport->sdev->device, sg, ioctx->sg_cnt,
-				opposite_dma_dir(dir));
+				target_reverse_dma_direction(&ioctx->cmd));
 		ioctx->mapped_sg_count = 0;
 	}
 }
@@ -1086,7 +1073,7 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
 	ioctx->sg_cnt = sg_cnt = cmd->t_data_nents;
 
 	count = ib_dma_map_sg(ch->sport->sdev->device, sg, sg_cnt,
-			      opposite_dma_dir(dir));
+			      target_reverse_dma_direction(cmd));
 	if (unlikely(!count))
 		return -EAGAIN;
 
-- 
2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2016-02-04 22:48 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-04 22:44 [PATCH v3 00/21] IB/srpt patches for Linux kernel v4.6 Bart Van Assche
     [not found] ` <56B3D453.7030409-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2016-02-04 22:45   ` [PATCH v3 01/21] IB/srpt: Simplify srpt_handle_tsk_mgmt() Bart Van Assche
2016-02-04 22:46   ` [PATCH v3 02/21] IB/srpt: Add parentheses around sizeof argument Bart Van Assche
2016-02-04 22:46   ` [PATCH v3 03/21] IB/srpt: Remove struct srpt_node_acl Bart Van Assche
     [not found]     ` <56B3D4D7.8060800-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2016-02-09 13:15       ` Christoph Hellwig
     [not found]         ` <20160209131507.GA25849-jcswGhMUV9g@public.gmane.org>
2016-02-09 15:03           ` Bart Van Assche
     [not found]             ` <56B9FFD8.2040809-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2016-02-09 15:08               ` Christoph Hellwig
     [not found]                 ` <20160209150854.GA27614-jcswGhMUV9g@public.gmane.org>
2016-02-09 15:13                   ` Bart Van Assche
2016-02-04 22:47   ` [PATCH v3 04/21] IB/srpt: Inline srpt_sdev_name() Bart Van Assche
2016-02-04 22:47   ` [PATCH v3 05/21] IB/srpt: Inline srpt_get_ch_state() Bart Van Assche
2016-02-04 22:48   ` Bart Van Assche [this message]
2016-02-04 22:48   ` [PATCH v3 07/21] IB/srpt: Use scsilun_to_int() Bart Van Assche
2016-02-04 22:49   ` [PATCH v3 08/21] IB/srpt: Simplify channel state management Bart Van Assche
2016-02-04 22:49   ` [PATCH v3 09/21] IB/srpt: Simplify srpt_shutdown_session() Bart Van Assche
2016-02-04 22:50   ` [PATCH v3 10/21] IB/srpt: Fix srpt_close_session() Bart Van Assche
2016-02-04 22:51   ` [PATCH v3 11/21] IB/srpt: Fix srpt_handle_cmd() error paths Bart Van Assche
2016-02-04 22:52   ` [PATCH v3 12/21] IB/srpt: Fix how aborted commands are processed Bart Van Assche
2016-02-04 22:55   ` [PATCH v3 13/21] IB/srpt: Inline trivial CM callback functions Bart Van Assche
2016-02-04 22:56   ` [PATCH v3 14/21] IB/srpt: Eliminate srpt_find_channel() Bart Van Assche
2016-02-04 22:57   ` [PATCH v3 15/21] IB/srpt: Log private data associated with REJ Bart Van Assche
2016-02-04 22:57   ` [PATCH v3 16/21] IB/srpt: Use a mutex to protect the channel list Bart Van Assche
     [not found]     ` <56B3D75B.3030202-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2016-02-09 13:16       ` Christoph Hellwig
2016-02-04 22:57   ` [PATCH v3 17/21] IB/srpt: Detect session shutdown reliably Bart Van Assche
2016-02-04 22:58   ` [PATCH v3 18/21] IB/srpt: Fix srpt_write_pending() Bart Van Assche
2016-02-04 22:58   ` [PATCH v3 19/21] IB/srpt: Log out all initiators if a port is disabled Bart Van Assche
2016-02-04 22:59   ` [PATCH v3 20/21] IB/srpt: Introduce srpt_process_wait_list() Bart Van Assche
2016-02-04 22:59   ` [PATCH v3 21/21] IB/srpt: Fix wait list processing Bart Van Assche

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56B3D526.9000103@sandisk.com \
    --to=bart.vanassche-xdaiopvojttbdgjk7y7tuq@public.gmane.org \
    --cc=alex.estrin-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    --cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=hch-jcswGhMUV9g@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).