From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
This patch drops the unused TFO->stop_session() API caller from
target-core and removes usage from lio-core.git fabric module code.
Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 10 ----------
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 22 ----------------------
drivers/target/iscsi/iscsi_target_configfs.c | 11 -----------
drivers/target/loopback/tcm_loop.c | 9 ---------
drivers/target/target_core_configfs.c | 4 ----
drivers/target/tcm_fc/tcm_fc.h | 1 -
drivers/target/tcm_fc/tfc_conf.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 7 -------
drivers/target/tcm_vhost/tcm_vhost_configfs.c | 1 -
drivers/target/tcm_vhost/tcm_vhost_fabric.c | 5 -----
drivers/target/tcm_vhost/tcm_vhost_fabric.h | 1 -
drivers/target/usb-gadget/configfs.c | 1 -
drivers/target/usb-gadget/usbg.h | 1 -
include/target/target_core_fabric.h | 1 -
14 files changed, 0 insertions(+), 75 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index de0c0cc..bdd2a21 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3462,15 +3462,6 @@ static void srpt_close_session(struct se_session *se_sess)
WARN_ON(res <= 0);
}
-/**
- * To do: Find out whether stop_session() has a meaning for transports
- * other than iSCSI.
- */
-static void srpt_stop_session(struct se_session *se_sess, int sess_sleep,
- int conn_sleep)
-{
-}
-
static int srpt_sess_logged_in(struct se_session *se_sess)
{
return true;
@@ -3892,7 +3883,6 @@ static struct target_core_fabric_ops srpt_template = {
.check_stop_free = srpt_check_stop_free,
.shutdown_session = srpt_shutdown_session,
.close_session = srpt_close_session,
- .stop_session = srpt_stop_session,
.sess_logged_in = srpt_sess_logged_in,
.sess_get_index = srpt_sess_get_index,
.sess_get_initiator_sid = NULL,
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 6ef8ddd..8e7719b 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -462,26 +462,6 @@ void tcm_qla2xxx_close_session(struct se_session *se_sess)
spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
}
-void tcm_qla2xxx_stop_session(struct se_session *se_sess, int sess_sleep , int conn_sleep)
-{
-#if 0
- struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
- struct scsi_qla_host *vha;
- unsigned long flags;
-
- if (!sess) {
- pr_err("se_sess->fabric_sess_ptr is NULL\n");
- dump_stack();
- return;
- }
- vha = sess->vha;
-
- spin_lock_irqsave(&vha->hw->hardware_lock, flags);
- tcm_qla2xxx_clear_nacl_from_fcport_map(se_sess->se_node_acl);
- spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
-#endif
-}
-
int tcm_qla2xxx_sess_logged_in(struct se_session *se_sess)
{
return 0;
@@ -1766,7 +1746,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
.release_cmd = tcm_qla2xxx_release_cmd,
.shutdown_session = tcm_qla2xxx_shutdown_session,
.close_session = tcm_qla2xxx_close_session,
- .stop_session = tcm_qla2xxx_stop_session,
.sess_logged_in = tcm_qla2xxx_sess_logged_in,
.sess_get_index = tcm_qla2xxx_sess_get_index,
.sess_get_initiator_sid = NULL,
@@ -1816,7 +1795,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
.release_cmd = tcm_qla2xxx_release_cmd,
.shutdown_session = tcm_qla2xxx_shutdown_session,
.close_session = tcm_qla2xxx_close_session,
- .stop_session = tcm_qla2xxx_stop_session,
.sess_logged_in = tcm_qla2xxx_sess_logged_in,
.sess_get_index = tcm_qla2xxx_sess_get_index,
.sess_get_initiator_sid = NULL,
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 643d5c1..daeb5a2 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1718,16 +1718,6 @@ static void lio_tpg_close_session(struct se_session *se_sess)
iscsit_close_session(sess);
}
-static void lio_tpg_stop_session(
- struct se_session *se_sess,
- int sess_sleep,
- int conn_sleep)
-{
- struct iscsi_session *sess = se_sess->fabric_sess_ptr;
-
- iscsit_stop_session(sess, sess_sleep, conn_sleep);
-}
-
static u32 lio_tpg_get_inst_index(struct se_portal_group *se_tpg)
{
struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;
@@ -1791,7 +1781,6 @@ int iscsi_target_register_configfs(void)
fabric->tf_ops.release_cmd = &lio_release_cmd;
fabric->tf_ops.shutdown_session = &lio_tpg_shutdown_session;
fabric->tf_ops.close_session = &lio_tpg_close_session;
- fabric->tf_ops.stop_session = &lio_tpg_stop_session;
fabric->tf_ops.sess_logged_in = &lio_sess_logged_in;
fabric->tf_ops.sess_get_index = &lio_sess_get_index;
fabric->tf_ops.sess_get_initiator_sid = &lio_sess_get_initiator_sid;
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 2844f77..f85fbbd 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -785,14 +785,6 @@ static void tcm_loop_close_session(struct se_session *se_sess)
return;
};
-static void tcm_loop_stop_session(
- struct se_session *se_sess,
- int sess_sleep,
- int conn_sleep)
-{
- return;
-}
-
static int tcm_loop_write_pending(struct se_cmd *se_cmd)
{
/*
@@ -1386,7 +1378,6 @@ static int tcm_loop_register_configfs(void)
fabric->tf_ops.release_cmd = &tcm_loop_release_cmd;
fabric->tf_ops.shutdown_session = &tcm_loop_shutdown_session;
fabric->tf_ops.close_session = &tcm_loop_close_session;
- fabric->tf_ops.stop_session = &tcm_loop_stop_session;
fabric->tf_ops.sess_logged_in = &tcm_loop_sess_logged_in;
fabric->tf_ops.sess_get_index = &tcm_loop_sess_get_index;
fabric->tf_ops.sess_get_initiator_sid = NULL;
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 1292f5b..917c38a 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -421,10 +421,6 @@ static int target_fabric_tf_ops_check(
pr_err("Missing tfo->close_session()\n");
return -EINVAL;
}
- if (!tfo->stop_session) {
- pr_err("Missing tfo->stop_session()\n");
- return -EINVAL;
- }
if (!tfo->sess_logged_in) {
pr_err("Missing tfo->sess_logged_in()\n");
return -EINVAL;
diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index 2e28d0a..9832889 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -141,7 +141,6 @@ extern struct target_fabric_configfs *ft_configfs;
void ft_sess_put(struct ft_sess *);
int ft_sess_shutdown(struct se_session *);
void ft_sess_close(struct se_session *);
-void ft_sess_stop(struct se_session *, int, int);
int ft_sess_logged_in(struct se_session *);
u32 ft_sess_get_index(struct se_session *);
u32 ft_sess_get_port_name(struct se_session *, unsigned char *, u32);
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 06d5c5e..71ee820 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -529,7 +529,6 @@ static struct target_core_fabric_ops ft_fabric_ops = {
.release_cmd = ft_release_cmd,
.shutdown_session = ft_sess_shutdown,
.close_session = ft_sess_close,
- .stop_session = ft_sess_stop,
.sess_logged_in = ft_sess_logged_in,
.sess_get_index = ft_sess_get_index,
.sess_get_initiator_sid = NULL,
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index e264486..08e0f49 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -328,13 +328,6 @@ void ft_sess_close(struct se_session *se_sess)
synchronize_rcu(); /* let transport deregister happen */
}
-void ft_sess_stop(struct se_session *se_sess, int sess_sleep, int conn_sleep)
-{
- struct ft_sess *sess = se_sess->fabric_sess_ptr;
-
- pr_debug("port_id %x\n", sess->port_id);
-}
-
int ft_sess_logged_in(struct se_session *se_sess)
{
struct ft_sess *sess = se_sess->fabric_sess_ptr;
diff --git a/drivers/target/tcm_vhost/tcm_vhost_configfs.c b/drivers/target/tcm_vhost/tcm_vhost_configfs.c
index b559f97..86fda5a 100644
--- a/drivers/target/tcm_vhost/tcm_vhost_configfs.c
+++ b/drivers/target/tcm_vhost/tcm_vhost_configfs.c
@@ -518,7 +518,6 @@ static struct target_core_fabric_ops tcm_vhost_ops = {
.release_cmd = tcm_vhost_release_cmd,
.shutdown_session = tcm_vhost_shutdown_session,
.close_session = tcm_vhost_close_session,
- .stop_session = tcm_vhost_stop_session,
.sess_logged_in = tcm_vhost_sess_logged_in,
.sess_get_index = tcm_vhost_sess_get_index,
.sess_get_initiator_sid = NULL,
diff --git a/drivers/target/tcm_vhost/tcm_vhost_fabric.c b/drivers/target/tcm_vhost/tcm_vhost_fabric.c
index 452c593..e38fa60 100644
--- a/drivers/target/tcm_vhost/tcm_vhost_fabric.c
+++ b/drivers/target/tcm_vhost/tcm_vhost_fabric.c
@@ -283,11 +283,6 @@ void tcm_vhost_close_session(struct se_session *se_sess)
return;
}
-void tcm_vhost_stop_session(struct se_session *se_sess, int sess_sleep , int conn_sleep)
-{
- return;
-}
-
int tcm_vhost_sess_logged_in(struct se_session *se_sess)
{
return 0;
diff --git a/drivers/target/tcm_vhost/tcm_vhost_fabric.h b/drivers/target/tcm_vhost/tcm_vhost_fabric.h
index 11e69f1..f6a2ac0 100644
--- a/drivers/target/tcm_vhost/tcm_vhost_fabric.h
+++ b/drivers/target/tcm_vhost/tcm_vhost_fabric.h
@@ -21,7 +21,6 @@ int tcm_vhost_new_cmd_map(struct se_cmd *);
void tcm_vhost_release_cmd(struct se_cmd *);
int tcm_vhost_shutdown_session(struct se_session *);
void tcm_vhost_close_session(struct se_session *);
-void tcm_vhost_stop_session(struct se_session *, int, int);
int tcm_vhost_sess_logged_in(struct se_session *);
u32 tcm_vhost_sess_get_index(struct se_session *);
int tcm_vhost_write_pending(struct se_cmd *);
diff --git a/drivers/target/usb-gadget/configfs.c b/drivers/target/usb-gadget/configfs.c
index 1096378..63d4f44 100644
--- a/drivers/target/usb-gadget/configfs.c
+++ b/drivers/target/usb-gadget/configfs.c
@@ -440,7 +440,6 @@ static struct target_core_fabric_ops usbg_ops = {
.release_cmd = usbg_release_cmd,
.shutdown_session = usbg_shutdown_session,
.close_session = usbg_close_session,
- .stop_session = usbg_stop_session,
.sess_logged_in = usbg_sess_logged_in,
.sess_get_index = usbg_sess_get_index,
.sess_get_initiator_sid = NULL,
diff --git a/drivers/target/usb-gadget/usbg.h b/drivers/target/usb-gadget/usbg.h
index 3b5fa89..fcaf0d7 100644
--- a/drivers/target/usb-gadget/usbg.h
+++ b/drivers/target/usb-gadget/usbg.h
@@ -193,7 +193,6 @@ int usbg_cmd_queue_supported(struct se_cmd *se_cmd);
void usbg_release_cmd(struct se_cmd *);
int usbg_shutdown_session(struct se_session *);
void usbg_close_session(struct se_session *);
-void usbg_stop_session(struct se_session *, int, int);
int usbg_sess_logged_in(struct se_session *);
u32 usbg_sess_get_index(struct se_session *);
int usbg_write_pending(struct se_cmd *);
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 6b85f04..9b44834 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -62,7 +62,6 @@ struct target_core_fabric_ops {
*/
int (*shutdown_session)(struct se_session *);
void (*close_session)(struct se_session *);
- void (*stop_session)(struct se_session *, int, int);
int (*sess_logged_in)(struct se_session *);
u32 (*sess_get_index)(struct se_session *);
/*
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
