12 files changed, 4 insertions, 66 deletions

diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
index 7d370c9b1450..6b8aa4086c5d 100755
--- a/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@ -294,7 +294,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "        .tpg_check_prod_mode_write_protect = " + fabric_mod_name + "_check_false,\n"
         buf += "        .tpg_get_inst_index             = " + fabric_mod_name + "_tpg_get_inst_index,\n"
         buf += "        .release_cmd                    = " + fabric_mod_name + "_release_cmd,\n"
-        buf += "        .shutdown_session               = " + fabric_mod_name + "_shutdown_session,\n"
         buf += "        .close_session                  = " + fabric_mod_name + "_close_session,\n"
         buf += "        .sess_get_index                 = " + fabric_mod_name + "_sess_get_index,\n"
         buf += "        .sess_get_initiator_sid         = NULL,\n"
@@ -467,13 +466,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
                         buf += "}\n\n"
                         bufi += "void " + fabric_mod_name + "_release_cmd(struct se_cmd *);\n"
 
-                if re.search('shutdown_session\)\(', fo):
-                        buf += "int " + fabric_mod_name + "_shutdown_session(struct se_session *se_sess)\n"
-                        buf += "{\n"
-                        buf += "        return 0;\n"
-                        buf += "}\n\n"
-                        bufi += "int " + fabric_mod_name + "_shutdown_session(struct se_session *);\n"
-
                 if re.search('close_session\)\(', fo):
                         buf += "void " + fabric_mod_name + "_close_session(struct se_session *se_sess)\n"
                         buf += "{\n"
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 8b42401d4795..3b425af04572 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1960,14 +1960,6 @@ static void __srpt_close_all_ch(struct srpt_device *sdev)
         }
 }
 
-/**
- * srpt_shutdown_session() - Whether or not a session may be shut down.
- */
-static int srpt_shutdown_session(struct se_session *se_sess)
-{
-        return 1;
-}
-
 static void srpt_free_ch(struct kref *kref)
 {
         struct srpt_rdma_ch *ch = container_of(kref, struct srpt_rdma_ch, kref);
@@ -3287,7 +3279,6 @@ static const struct target_core_fabric_ops srpt_template = {
         .tpg_get_inst_index             = srpt_tpg_get_inst_index,
         .release_cmd                    = srpt_release_cmd,
         .check_stop_free                = srpt_check_stop_free,
-        .shutdown_session               = srpt_shutdown_session,
         .close_session                  = srpt_close_session,
         .sess_get_index                 = srpt_sess_get_index,
         .sess_get_initiator_sid         = NULL,
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 0ad5ac541a7f..0941b2c13f5a 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -601,11 +601,6 @@ static int tcm_loop_get_cmd_state(struct se_cmd *se_cmd)
         return tl_cmd->sc_cmd_state;
 }
 
-static int tcm_loop_shutdown_session(struct se_session *se_sess)
-{
-        return 0;
-}
-
 static void tcm_loop_close_session(struct se_session *se_sess)
 {
         return;
@@ -1243,7 +1238,6 @@ static const struct target_core_fabric_ops loop_ops = {
         .tpg_get_inst_index             = tcm_loop_get_inst_index,
         .check_stop_free                = tcm_loop_check_stop_free,
         .release_cmd                    = tcm_loop_release_cmd,
-        .shutdown_session               = tcm_loop_shutdown_session,
         .close_session                  = tcm_loop_close_session,
         .sess_get_index                 = tcm_loop_sess_get_index,
         .write_pending                  = tcm_loop_write_pending,
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index c57e7884973d..6c8b8f84a047 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -1726,11 +1726,6 @@ static void sbp_release_cmd(struct se_cmd *se_cmd)
         sbp_free_request(req);
 }
 
-static int sbp_shutdown_session(struct se_session *se_sess)
-{
-        return 0;
-}
-
 static void sbp_close_session(struct se_session *se_sess)
 {
         return;
@@ -2349,7 +2344,6 @@ static const struct target_core_fabric_ops sbp_ops = {
         .tpg_check_prod_mode_write_protect = sbp_check_false,
         .tpg_get_inst_index             = sbp_tpg_get_inst_index,
         .release_cmd                    = sbp_release_cmd,
-        .shutdown_session               = sbp_shutdown_session,
         .close_session                  = sbp_close_session,
         .sess_get_index                 = sbp_sess_get_index,
         .write_pending                  = sbp_write_pending,
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 73c23c75528a..75c5000ca95e 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -385,10 +385,6 @@ static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo)
                 pr_err("Missing tfo->release_cmd()\n");
                 return -EINVAL;
         }
-        if (!tfo->shutdown_session) {
-                pr_err("Missing tfo->shutdown_session()\n");
-                return -EINVAL;
-        }
         if (!tfo->close_session) {
                 pr_err("Missing tfo->close_session()\n");
                 return -EINVAL;
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index b1ac600f5b45..a81a37045403 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -353,7 +353,10 @@ restart:
                 list_del_init(&sess->sess_acl_list);
 
                 spin_unlock_irqrestore(&acl->nacl_sess_lock, flags);
-                ret = acl->se_tpg->se_tpg_tfo->shutdown_session(sess);
+                if (acl->se_tpg->se_tpg_tfo->shutdown_session)
+                        ret = acl->se_tpg->se_tpg_tfo->shutdown_session(sess);
+                else
+                        ret = 1;
                 target_put_session(sess);
                 if (ret)
                         target_put_session(sess);
diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index c30003bd4ff0..e28209b99b59 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -139,7 +139,6 @@ extern unsigned int ft_debug_logging;
  * Session ops.
  */
 void ft_sess_put(struct ft_sess *);
-int ft_sess_shutdown(struct se_session *);
 void ft_sess_close(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 4d375e95841b..42ee91123dca 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -442,7 +442,6 @@ static const struct target_core_fabric_ops ft_fabric_ops = {
         .tpg_get_inst_index =           ft_tpg_get_inst_index,
         .check_stop_free =              ft_check_stop_free,
         .release_cmd =                  ft_release_cmd,
-        .shutdown_session =             ft_sess_shutdown,
         .close_session =                ft_sess_close,
         .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 d0c3e1894c61..f5186a744399 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -303,18 +303,6 @@ static void ft_sess_delete_all(struct ft_tport *tport)
  */
 
 /*
- * Determine whether session is allowed to be shutdown in the current context.
- * Returns non-zero if the session should be shutdown.