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

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

scsi: target: srp, vscsi, sbp, qla: use target_remove_session 



This converts the drivers that called transport_deregister_session_configfs
and then immediately called transport_deregister_session to use
target_remove_session.

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>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fb7c70f2

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −2
Original line number Diff line number Diff line
@@ -2029,8 +2029,7 @@ static void srpt_release_channel_work(struct work_struct *w) 
	target_sess_cmd_list_set_waiting(se_sess);

	target_wait_for_sess_cmds(se_sess);



	transport_deregister_session_configfs(se_sess);

	transport_deregister_session(se_sess);

	target_remove_session(se_sess);

	ch->sess = NULL;



	if (ch->using_rdma_cm)

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+1 −2
Original line number Diff line number Diff line
@@ -2267,8 +2267,7 @@ static int ibmvscsis_drop_nexus(struct ibmvscsis_tport *tport) 
	 * Release the SCSI I_T Nexus to the emulated ibmvscsis Target Port

	 */

	target_wait_for_sess_cmds(se_sess);

	transport_deregister_session_configfs(se_sess);

	transport_deregister_session(se_sess);

	target_remove_session(se_sess);

	tport->ibmv_nexus = NULL;

	kfree(nexus);

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+1 −2
Original line number Diff line number Diff line
@@ -1461,8 +1461,7 @@ static void tcm_qla2xxx_free_session(struct fc_port *sess) 
	}

	target_wait_for_sess_cmds(se_sess);



	transport_deregister_session_configfs(sess->se_sess);

	transport_deregister_session(sess->se_sess);

	target_remove_session(se_sess);

}



static int tcm_qla2xxx_session_cb(struct se_portal_group *se_tpg,

drivers/target/sbp/sbp_target.c

+1 −2
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ static void sbp_session_release(struct sbp_session *sess, bool cancel_work) 
	if (cancel_work)

		cancel_delayed_work_sync(&sess->maint_work);



	transport_deregister_session_configfs(sess->se_sess);

	transport_deregister_session(sess->se_sess);

	target_remove_session(sess->se_sess);



	if (sess->card)

		fw_card_put(sess->card);