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

Commit fa834287 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: target: rename target_alloc_session 



Rename target_alloc_session to target_setup_session to avoid confusion with
the other transport session allocation function that only allocates the
session and because the target_alloc_session does so much more. It
allocates the session, sets up the nacl and registers the session.

The next patch will then add a remove function to match the setup in this
one, so it should make sense for all drivers, except iscsi, to just call
those 2 functions to setup and remove a session.

iscsi will continue to be the odd driver.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Chris Boot <bootc@bootc.net>
Cc: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
Cc: Michael Cyr <mikecyr@linux.vnet.ibm.com>
Cc: <qla2xxx-upstream@qlogic.com>
Cc: Johannes Thumshirn <jth@kernel.org>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3cd14285

drivers/infiniband/ulp/srpt/ib_srpt.c

+3 −3
Original line number Diff line number Diff line
@@ -2221,16 +2221,16 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, 
	pr_debug("registering session %s\n", ch->sess_name);



	if (sport->port_guid_tpg.se_tpg_wwn)

		ch->sess = target_alloc_session(&sport->port_guid_tpg, 0, 0,

		ch->sess = target_setup_session(&sport->port_guid_tpg, 0, 0,

						TARGET_PROT_NORMAL,

						ch->sess_name, ch, NULL);

	if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess))

		ch->sess = target_alloc_session(&sport->port_gid_tpg, 0, 0,

		ch->sess = target_setup_session(&sport->port_gid_tpg, 0, 0,

					TARGET_PROT_NORMAL, i_port_id, ch,

					NULL);

	/* Retry without leading "0x" */

	if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess))

		ch->sess = target_alloc_session(&sport->port_gid_tpg, 0, 0,

		ch->sess = target_setup_session(&sport->port_gid_tpg, 0, 0,

						TARGET_PROT_NORMAL,

						i_port_id + 2, ch, NULL);

	if (IS_ERR_OR_NULL(ch->sess)) {

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+1 −1
Original line number Diff line number Diff line
@@ -2233,7 +2233,7 @@ static int ibmvscsis_make_nexus(struct ibmvscsis_tport *tport) 
		return -ENOMEM;

	}



	nexus->se_sess = target_alloc_session(&tport->se_tpg, 0, 0,

	nexus->se_sess = target_setup_session(&tport->se_tpg, 0, 0,

					      TARGET_PROT_NORMAL, name, nexus,

					      NULL);

	if (IS_ERR(nexus->se_sess)) {

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ static int tcm_qla2xxx_check_initiator_node_acl( 
	 * Locate our struct se_node_acl either from an explict NodeACL created

	 * via ConfigFS, or via running in TPG demo mode.

	 */

	se_sess = target_alloc_session(&tpg->se_tpg, num_tags,

	se_sess = target_setup_session(&tpg->se_tpg, num_tags,

				       sizeof(struct qla_tgt_cmd),

				       TARGET_PROT_ALL, port_name,

				       qlat_sess, tcm_qla2xxx_session_cb);

drivers/target/loopback/tcm_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int tcm_loop_make_nexus( 
	if (!tl_nexus)

		return -ENOMEM;



	tl_nexus->se_sess = target_alloc_session(&tl_tpg->tl_se_tpg, 0, 0,

	tl_nexus->se_sess = target_setup_session(&tl_tpg->tl_se_tpg, 0, 0,

					TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS,

					name, tl_nexus, tcm_loop_alloc_sess_cb);

	if (IS_ERR(tl_nexus->se_sess)) {

drivers/target/sbp/sbp_target.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static struct sbp_session *sbp_session_create( 
	INIT_DELAYED_WORK(&sess->maint_work, session_maintenance_work);

	sess->guid = guid;



	sess->se_sess = target_alloc_session(&tpg->se_tpg, 128,

	sess->se_sess = target_setup_session(&tpg->se_tpg, 128,

					     sizeof(struct sbp_target_request),

					     TARGET_PROT_NORMAL, guid_str,

					     sess, NULL);