iscsit_shutdown_np_thread() now called for TPG disable, or portal
deletion.
Signed-off-by: David Disseldorp <ddiss@xxxxxxx>
---
drivers/target/iscsi/iscsi_target.c | 30 ------------------------------
drivers/target/iscsi/iscsi_target.h | 2 --
2 files changed, 32 deletions(-)
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index e3ae33d..2c6ed34 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -420,36 +420,6 @@ struct iscsi_np *iscsit_add_np(
return np;
}
-int iscsit_reset_np_thread(
- struct iscsi_np *np,
- struct iscsi_tpg_np *tpg_np,
- struct iscsi_portal_group *tpg,
- bool shutdown)
-{
- spin_lock_bh(&np->np_thread_lock);
- if (np->np_thread_state == ISCSI_NP_THREAD_INACTIVE) {
- spin_unlock_bh(&np->np_thread_lock);
- return 0;
- }
- np->np_thread_state = ISCSI_NP_THREAD_RESET;
-
- if (np->np_thread) {
- spin_unlock_bh(&np->np_thread_lock);
- send_sig(SIGINT, np->np_thread, 1);
- wait_for_completion(&np->np_restart_comp);
- spin_lock_bh(&np->np_thread_lock);
- }
- spin_unlock_bh(&np->np_thread_lock);
-
- if (tpg_np && shutdown) {
- kref_put(&tpg_np->tpg_np_kref, iscsit_login_kref_put);
-
- wait_for_completion(&tpg_np->tpg_np_comp);
- }
-
- return 0;
-}
-
int iscsit_shutdown_np_thread(
struct iscsi_np *np,
struct iscsi_tpg_np *tpg_np,
diff --git a/drivers/target/iscsi/iscsi_target.h b/drivers/target/iscsi/iscsi_target.h
index 86051fa..a774995 100644
--- a/drivers/target/iscsi/iscsi_target.h
+++ b/drivers/target/iscsi/iscsi_target.h
@@ -14,8 +14,6 @@ extern bool iscsit_check_np_match(struct __kernel_sockaddr_storage *,
struct iscsi_np *, int);
extern struct iscsi_np *iscsit_add_np(struct __kernel_sockaddr_storage *,
char *, int);
-extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *,
- struct iscsi_portal_group *, bool);
extern int iscsit_shutdown_np_thread(struct iscsi_np *, struct iscsi_tpg_np *,
struct iscsi_portal_group *);
int iscsit_enable_np_thread(struct iscsi_np *);
--
2.1.4
--
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
