Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/target/iscsi/iscsi_target.c | 35 ++++++++++++--------
- drivers/target/iscsi/iscsi_target_configfs.c | 5 ++-
- drivers/target/iscsi/iscsi_target_login.c | 5 +--
- include/target/iscsi/iscsi_target_core.h | 2 +-
+ drivers/target/iscsi/iscsi_target.c | 35 ++++++++++++++++-----------
+ drivers/target/iscsi/iscsi_target_configfs.c | 5 +++
+ drivers/target/iscsi/iscsi_target_login.c | 5 ++-
+ include/target/iscsi/iscsi_target_core.h | 2 -
4 files changed, 30 insertions(+), 17 deletions(-)
-diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
-index 9134ea8fc0878..2b8fbcd8dde24 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -4321,30 +4321,37 @@ int iscsit_close_connection(
return 0;
}
-@@ -4453,9 +4460,9 @@ static void iscsit_logout_post_handler_closesession(
+@@ -4453,9 +4460,9 @@ static void iscsit_logout_post_handler_c
complete(&conn->conn_logout_comp);
iscsit_dec_conn_usage_count(conn);
if (connection_sleep) {
list_for_each_entry_safe(conn, conn_tmp, &sess->sess_conn_list,
-@@ -4659,12 +4664,15 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
+@@ -4659,12 +4664,15 @@ int iscsit_release_sessions_for_tpg(stru
spin_lock(&sess->conn_lock);
if (atomic_read(&sess->session_fall_back_to_erl0) ||
atomic_read(&sess->session_logout) ||
spin_unlock(&sess->conn_lock);
list_move_tail(&se_sess->sess_list, &free_list);
-@@ -4674,8 +4682,9 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
+@@ -4674,8 +4682,9 @@ int iscsit_release_sessions_for_tpg(stru
list_for_each_entry_safe(se_sess, se_sess_tmp, &free_list, sess_list) {
sess = (struct iscsi_session *)se_sess->fabric_sess_ptr;
session_count++;
}
-diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
-index 8a4bc15bc3f56..0718f688277a8 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
-@@ -1527,20 +1527,23 @@ static void lio_tpg_close_session(struct se_session *se_sess)
+@@ -1527,20 +1527,23 @@ static void lio_tpg_close_session(struct
spin_lock(&sess->conn_lock);
if (atomic_read(&sess->session_fall_back_to_erl0) ||
atomic_read(&sess->session_logout) ||
}
static u32 lio_tpg_get_inst_index(struct se_portal_group *se_tpg)
-diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
-index d2f82aaf6a851..985e600908e0e 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
-@@ -195,6 +195,7 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
+@@ -195,6 +195,7 @@ int iscsi_check_for_session_reinstatemen
spin_lock(&sess_p->conn_lock);
if (atomic_read(&sess_p->session_fall_back_to_erl0) ||
atomic_read(&sess_p->session_logout) ||
(sess_p->time2retain_timer_flags & ISCSI_TF_EXPIRED)) {
spin_unlock(&sess_p->conn_lock);
continue;
-@@ -205,6 +206,7 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
+@@ -205,6 +206,7 @@ int iscsi_check_for_session_reinstatemen
(sess_p->sess_ops->SessionType == sessiontype))) {
atomic_set(&sess_p->session_reinstatement, 1);
atomic_set(&sess_p->session_fall_back_to_erl0, 1);
spin_unlock(&sess_p->conn_lock);
iscsit_inc_session_usage_count(sess_p);
iscsit_stop_time2retain_timer(sess_p);
-@@ -229,7 +231,6 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
+@@ -229,7 +231,6 @@ int iscsi_check_for_session_reinstatemen
if (sess->session_state == TARG_SESS_STATE_FAILED) {
spin_unlock_bh(&sess->conn_lock);
iscsit_dec_session_usage_count(sess);
return 0;
}
spin_unlock_bh(&sess->conn_lock);
-@@ -237,7 +238,6 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
+@@ -237,7 +238,6 @@ int iscsi_check_for_session_reinstatemen
iscsit_stop_session(sess, 1, 1);
iscsit_dec_session_usage_count(sess);
(sess_p->time2retain_timer_flags & ISCSI_TF_EXPIRED))
continue;
if (!memcmp(sess_p->isid, pdu->isid, 6) &&
-diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h
-index 6021c3acb6c5a..b1814d2762bdb 100644
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
@@ -671,7 +671,7 @@ struct iscsi_session {
/* connection list */
struct list_head sess_conn_list;
struct list_head cr_active_list;
---
-2.20.1
-