From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
This patch drops the unused TFO->fall_back_to_erl0() API caller from
target-core and removes stubs from lio-core.git fabric module code.
Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 6 ------
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 7 -------
drivers/target/iscsi/iscsi_target_configfs.c | 8 --------
drivers/target/loopback/tcm_loop.c | 6 ------
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 | 5 -----
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/fabric.c | 5 -----
drivers/target/usb-gadget/usbg.h | 1 -
include/target/target_core_fabric.h | 1 -
15 files changed, 0 insertions(+), 53 deletions(-)
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 262b61e..de0c0cc 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3471,11 +3471,6 @@ static void srpt_stop_session(struct se_session *se_sess, int sess_sleep,
{
}
-static void srpt_reset_nexus(struct se_session *sess)
-{
- printk(KERN_ERR "This is the SRP protocol, not iSCSI\n");
-}
-
static int srpt_sess_logged_in(struct se_session *se_sess)
{
return true;
@@ -3898,7 +3893,6 @@ static struct target_core_fabric_ops srpt_template = {
.shutdown_session = srpt_shutdown_session,
.close_session = srpt_close_session,
.stop_session = srpt_stop_session,
- .fall_back_to_erl0 = srpt_reset_nexus,
.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 b5a47d3..6ef8ddd 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -482,11 +482,6 @@ void tcm_qla2xxx_stop_session(struct se_session *se_sess, int sess_sleep , int c
#endif
}
-void tcm_qla2xxx_reset_nexus(struct se_session *se_sess)
-{
- return;
-}
-
int tcm_qla2xxx_sess_logged_in(struct se_session *se_sess)
{
return 0;
@@ -1772,7 +1767,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
.shutdown_session = tcm_qla2xxx_shutdown_session,
.close_session = tcm_qla2xxx_close_session,
.stop_session = tcm_qla2xxx_stop_session,
- .fall_back_to_erl0 = tcm_qla2xxx_reset_nexus,
.sess_logged_in = tcm_qla2xxx_sess_logged_in,
.sess_get_index = tcm_qla2xxx_sess_get_index,
.sess_get_initiator_sid = NULL,
@@ -1823,7 +1817,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
.shutdown_session = tcm_qla2xxx_shutdown_session,
.close_session = tcm_qla2xxx_close_session,
.stop_session = tcm_qla2xxx_stop_session,
- .fall_back_to_erl0 = tcm_qla2xxx_reset_nexus,
.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 29ea86c..643d5c1 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1728,13 +1728,6 @@ static void lio_tpg_stop_session(
iscsit_stop_session(sess, sess_sleep, conn_sleep);
}
-static void lio_tpg_fall_back_to_erl0(struct se_session *se_sess)
-{
- struct iscsi_session *sess = se_sess->fabric_sess_ptr;
-
- iscsit_fall_back_to_erl0(sess);
-}
-
static u32 lio_tpg_get_inst_index(struct se_portal_group *se_tpg)
{
struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;
@@ -1799,7 +1792,6 @@ int iscsi_target_register_configfs(void)
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.fall_back_to_erl0 = &lio_tpg_fall_back_to_erl0;
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 bb4b763..2844f77 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -793,11 +793,6 @@ static void tcm_loop_stop_session(
return;
}
-static void tcm_loop_fall_back_to_erl0(struct se_session *se_sess)
-{
- return;
-}
-
static int tcm_loop_write_pending(struct se_cmd *se_cmd)
{
/*
@@ -1392,7 +1387,6 @@ static int tcm_loop_register_configfs(void)
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.fall_back_to_erl0 = &tcm_loop_fall_back_to_erl0;
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 9ddf5a3..1292f5b 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -425,10 +425,6 @@ static int target_fabric_tf_ops_check(
pr_err("Missing tfo->stop_session()\n");
return -EINVAL;
}
- if (!tfo->fall_back_to_erl0) {
- pr_err("Missing tfo->fall_back_to_erl0()\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 650a2ba..2e28d0a 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -145,7 +145,6 @@ 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);
-void ft_sess_set_erl0(struct se_session *);
void ft_lport_add(struct fc_lport *, void *);
void ft_lport_del(struct fc_lport *, void *);
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 4c5e248..06d5c5e 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -530,7 +530,6 @@ static struct target_core_fabric_ops ft_fabric_ops = {
.shutdown_session = ft_sess_shutdown,
.close_session = ft_sess_close,
.stop_session = ft_sess_stop,
- .fall_back_to_erl0 = ft_sess_set_erl0,
.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 eff512b..e264486 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -357,11 +357,6 @@ u32 ft_sess_get_port_name(struct se_session *se_sess,
return ft_format_wwn(buf, len, sess->port_name);
}
-void ft_sess_set_erl0(struct se_session *se_sess)
-{
- /* XXX TBD called when out of memory */
-}
-
/*
* libfc ops involving sessions.
*/
diff --git a/drivers/target/tcm_vhost/tcm_vhost_configfs.c b/drivers/target/tcm_vhost/tcm_vhost_configfs.c
index 85f3f35..b559f97 100644
--- a/drivers/target/tcm_vhost/tcm_vhost_configfs.c
+++ b/drivers/target/tcm_vhost/tcm_vhost_configfs.c
@@ -519,7 +519,6 @@ static struct target_core_fabric_ops tcm_vhost_ops = {
.shutdown_session = tcm_vhost_shutdown_session,
.close_session = tcm_vhost_close_session,
.stop_session = tcm_vhost_stop_session,
- .fall_back_to_erl0 = tcm_vhost_reset_nexus,
.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 740940223..452c593 100644
--- a/drivers/target/tcm_vhost/tcm_vhost_fabric.c
+++ b/drivers/target/tcm_vhost/tcm_vhost_fabric.c
@@ -288,11 +288,6 @@ void tcm_vhost_stop_session(struct se_session *se_sess, int sess_sleep , int con
return;
}
-void tcm_vhost_reset_nexus(struct se_session *se_sess)
-{
- 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 dd142b6..11e69f1 100644
--- a/drivers/target/tcm_vhost/tcm_vhost_fabric.h
+++ b/drivers/target/tcm_vhost/tcm_vhost_fabric.h
@@ -22,7 +22,6 @@ 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);
-void tcm_vhost_reset_nexus(struct se_session *);
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 6fa4ee0..1096378 100644
--- a/drivers/target/usb-gadget/configfs.c
+++ b/drivers/target/usb-gadget/configfs.c
@@ -441,7 +441,6 @@ static struct target_core_fabric_ops usbg_ops = {
.shutdown_session = usbg_shutdown_session,
.close_session = usbg_close_session,
.stop_session = usbg_stop_session,
- .fall_back_to_erl0 = usbg_reset_nexus,
.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/fabric.c b/drivers/target/usb-gadget/fabric.c
index 2ae3aab..2a50282 100644
--- a/drivers/target/usb-gadget/fabric.c
+++ b/drivers/target/usb-gadget/fabric.c
@@ -571,11 +571,6 @@ void usbg_stop_session(struct se_session *se_sess, int sess_sleep,
return;
}
-void usbg_reset_nexus(struct se_session *se_sess)
-{
- return;
-}
-
int usbg_sess_logged_in(struct se_session *se_sess)
{
return 0;
diff --git a/drivers/target/usb-gadget/usbg.h b/drivers/target/usb-gadget/usbg.h
index 3410199..3b5fa89 100644
--- a/drivers/target/usb-gadget/usbg.h
+++ b/drivers/target/usb-gadget/usbg.h
@@ -194,7 +194,6 @@ 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);
-void usbg_reset_nexus(struct se_session *);
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 24b0ff4..6b85f04 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -63,7 +63,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);
- void (*fall_back_to_erl0)(struct se_session *);
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
