All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Christie <michael.christie@oracle.com>
To: hch@lst.de, loberman@redhat.com, martin.petersen@oracle.com,
	linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
	mst@redhat.com, stefanha@redhat.com
Cc: Mike Christie <michael.christie@oracle.com>,
	Bart Van Assche <bvanassche@acm.org>
Subject: [PATCH 05/14] srpt: Convert to new submission API
Date: Thu, 11 Feb 2021 06:27:19 -0600	[thread overview]
Message-ID: <20210211122728.31721-6-michael.christie@oracle.com> (raw)
In-Reply-To: <20210211122728.31721-1-michael.christie@oracle.com>

target_submit_cmd_map_sgls is being removed, so convert srpt to
the new submission API.

srpt uses target_stop_session to sync session shutdown with lio core,
so we use target_init_cmd/target_submit_prep/target_submit, because
target_init_cmd will detect the target_stop_session call and return
an error.

Cc: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
 drivers/infiniband/ulp/srpt/ib_srpt.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 6be60aa5ffe2..87741e0b4bca 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1528,16 +1528,19 @@ static void srpt_handle_cmd(struct srpt_rdma_ch *ch,
 		goto busy;
 	}
 
-	rc = target_submit_cmd_map_sgls(cmd, ch->sess, srp_cmd->cdb,
-			       &send_ioctx->sense_data[0],
-			       scsilun_to_int(&srp_cmd->lun), data_len,
-			       TCM_SIMPLE_TAG, dir, TARGET_SCF_ACK_KREF,
-			       sg, sg_cnt, NULL, 0, NULL, 0);
+	rc = target_init_cmd(cmd, ch->sess, &send_ioctx->sense_data[0],
+			     scsilun_to_int(&srp_cmd->lun), data_len,
+			     TCM_SIMPLE_TAG, dir, TARGET_SCF_ACK_KREF);
 	if (rc != 0) {
 		pr_debug("target_submit_cmd() returned %d for tag %#llx\n", rc,
 			 srp_cmd->tag);
 		goto busy;
 	}
+
+	if (target_submit_prep(cmd, srp_cmd->cdb, sg, sg_cnt, NULL, 0, NULL, 0))
+		return;
+
+	target_submit(cmd);
 	return;
 
 busy:
-- 
2.25.1


  parent reply	other threads:[~2021-02-11 12:33 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-11 12:27 [PATCH 01/14] target: remove target_submit_cmd_map_sgls Mike Christie
2021-02-11 12:27 ` [PATCH 01/14] target: move t_task_cdb initialization Mike Christie
2021-02-11 12:27 ` [PATCH 02/14] target: drop kref_get_unless_zero in target_get_sess_cmd Mike Christie
2021-02-11 15:09   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 03/14] target: rename transport_init_se_cmd Mike Christie
2021-02-11 15:10   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 04/14] target: break up target_submit_cmd_map_sgls Mike Christie
2021-02-11 15:12   ` Christoph Hellwig
2021-02-11 12:27 ` Mike Christie [this message]
2021-02-11 15:13   ` [PATCH 05/14] srpt: Convert to new submission API Christoph Hellwig
2021-02-11 12:27 ` [PATCH 06/14] ibmvscsi_tgt: " Mike Christie
2021-02-11 15:14   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 07/14] qla2xxx: " Mike Christie
2021-02-11 15:14   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 08/14] tcm_loop: " Mike Christie
2021-02-11 15:14   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 09/14] sbp_target: " Mike Christie
2021-02-11 15:15   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 10/14] usb gadget: " Mike Christie
2021-02-11 15:15   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 11/14] vhost-scsi: " Mike Christie
2021-02-11 12:27 ` [PATCH 12/14] xen-scsiback: " Mike Christie
2021-02-11 15:16   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 13/14] tcm_fc: " Mike Christie
2021-02-11 15:16   ` Christoph Hellwig
2021-02-11 12:27 ` [PATCH 14/14] target: remove target_submit_cmd_map_sgls Mike Christie
2021-02-11 15:17   ` Christoph Hellwig
2021-02-11 18:11     ` Mike Christie

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=20210211122728.31721-6-michael.christie@oracle.com \
    --to=michael.christie@oracle.com \
    --cc=bvanassche@acm.org \
    --cc=hch@lst.de \
    --cc=linux-scsi@vger.kernel.org \
    --cc=loberman@redhat.com \
    --cc=martin.petersen@oracle.com \
    --cc=mst@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=target-devel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.