diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-02-27 04:43:32 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-03-10 17:42:25 -0500 |
commit | 99367f01b8df2018ff3328ddf4111e701d34188d (patch) | |
tree | 5ef6e2ffe8b1d3ee8bfd995b80efcb4e6d02095d /drivers/target/iscsi/iscsi_target.c | |
parent | 337c060701fb3d27d9945bf7af7ba194ae2153a8 (diff) |
iscsi-target: Convert to use target_put_session + sess_kref
This patch converts iscsi-target session code to use se_sess->sess_kref
counting for iscsi session shutdown. The following cases include:
*) last iscsit_close_connection() shutdown path to invoke close session
*) iscsit_logout_post_handler_closesession() for explict logout
*) iscsit_free_session() caller for explict shutdown
It also moves iscsit_stop_session() call from lio_tpg_close_session()
into lio_tpg_shutdown_session() TFO callbacks to invoke an explict
shutdown, and also changes iscsi_check_for_session_reinstatement()
login code to use se_sess->sess_kref.
(v2: Make iscsit_handle_time2retain_timeout() use target_put_session)
Cc: Andy Grover <agrover@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target.c')
-rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index c3ef2f6f3740..d3b54ecbfcda 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
@@ -4168,7 +4168,7 @@ int iscsit_close_connection( | |||
4168 | if (!atomic_read(&sess->session_reinstatement) && | 4168 | if (!atomic_read(&sess->session_reinstatement) && |
4169 | atomic_read(&sess->session_fall_back_to_erl0)) { | 4169 | atomic_read(&sess->session_fall_back_to_erl0)) { |
4170 | spin_unlock_bh(&sess->conn_lock); | 4170 | spin_unlock_bh(&sess->conn_lock); |
4171 | iscsit_close_session(sess); | 4171 | target_put_session(sess->se_sess); |
4172 | 4172 | ||
4173 | return 0; | 4173 | return 0; |
4174 | } else if (atomic_read(&sess->session_logout)) { | 4174 | } else if (atomic_read(&sess->session_logout)) { |
@@ -4289,7 +4289,7 @@ static void iscsit_logout_post_handler_closesession( | |||
4289 | iscsit_dec_conn_usage_count(conn); | 4289 | iscsit_dec_conn_usage_count(conn); |
4290 | iscsit_stop_session(sess, 1, 1); | 4290 | iscsit_stop_session(sess, 1, 1); |
4291 | iscsit_dec_session_usage_count(sess); | 4291 | iscsit_dec_session_usage_count(sess); |
4292 | iscsit_close_session(sess); | 4292 | target_put_session(sess->se_sess); |
4293 | } | 4293 | } |
4294 | 4294 | ||
4295 | static void iscsit_logout_post_handler_samecid( | 4295 | static void iscsit_logout_post_handler_samecid( |
@@ -4455,7 +4455,7 @@ int iscsit_free_session(struct iscsi_session *sess) | |||
4455 | } else | 4455 | } else |
4456 | spin_unlock_bh(&sess->conn_lock); | 4456 | spin_unlock_bh(&sess->conn_lock); |
4457 | 4457 | ||
4458 | iscsit_close_session(sess); | 4458 | target_put_session(sess->se_sess); |
4459 | return 0; | 4459 | return 0; |
4460 | } | 4460 | } |
4461 | 4461 | ||