mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-17 12:14:43 +00:00
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: Mike Christie <mchristi@redhat.com> Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com> Reviewed-by: Christoph 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: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
fb7c70f2d7
commit
b287e3517e
4 changed files with 4 additions and 8 deletions
|
|
@ -2029,8 +2029,7 @@ static void srpt_release_channel_work(struct work_struct *w)
|
||||||
target_sess_cmd_list_set_waiting(se_sess);
|
target_sess_cmd_list_set_waiting(se_sess);
|
||||||
target_wait_for_sess_cmds(se_sess);
|
target_wait_for_sess_cmds(se_sess);
|
||||||
|
|
||||||
transport_deregister_session_configfs(se_sess);
|
target_remove_session(se_sess);
|
||||||
transport_deregister_session(se_sess);
|
|
||||||
ch->sess = NULL;
|
ch->sess = NULL;
|
||||||
|
|
||||||
if (ch->using_rdma_cm)
|
if (ch->using_rdma_cm)
|
||||||
|
|
|
||||||
|
|
@ -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
|
* Release the SCSI I_T Nexus to the emulated ibmvscsis Target Port
|
||||||
*/
|
*/
|
||||||
target_wait_for_sess_cmds(se_sess);
|
target_wait_for_sess_cmds(se_sess);
|
||||||
transport_deregister_session_configfs(se_sess);
|
target_remove_session(se_sess);
|
||||||
transport_deregister_session(se_sess);
|
|
||||||
tport->ibmv_nexus = NULL;
|
tport->ibmv_nexus = NULL;
|
||||||
kfree(nexus);
|
kfree(nexus);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1461,8 +1461,7 @@ static void tcm_qla2xxx_free_session(struct fc_port *sess)
|
||||||
}
|
}
|
||||||
target_wait_for_sess_cmds(se_sess);
|
target_wait_for_sess_cmds(se_sess);
|
||||||
|
|
||||||
transport_deregister_session_configfs(sess->se_sess);
|
target_remove_session(se_sess);
|
||||||
transport_deregister_session(sess->se_sess);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcm_qla2xxx_session_cb(struct se_portal_group *se_tpg,
|
static int tcm_qla2xxx_session_cb(struct se_portal_group *se_tpg,
|
||||||
|
|
|
||||||
|
|
@ -235,8 +235,7 @@ static void sbp_session_release(struct sbp_session *sess, bool cancel_work)
|
||||||
if (cancel_work)
|
if (cancel_work)
|
||||||
cancel_delayed_work_sync(&sess->maint_work);
|
cancel_delayed_work_sync(&sess->maint_work);
|
||||||
|
|
||||||
transport_deregister_session_configfs(sess->se_sess);
|
target_remove_session(sess->se_sess);
|
||||||
transport_deregister_session(sess->se_sess);
|
|
||||||
|
|
||||||
if (sess->card)
|
if (sess->card)
|
||||||
fw_card_put(sess->card);
|
fw_card_put(sess->card);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue