diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2013-05-15 00:52:44 -0700 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-07-03 14:26:32 -0400 |
| commit | dc36e56594496e4d897095c24b37978f442a765a (patch) | |
| tree | a143997650e29b9f21b08940233cc7c5e5d0c2d0 /include | |
| parent | fb0b01a80257ce9f43c6e14411818de47b515a68 (diff) | |
target: Re-instate sess_wait_list for target_wait_for_sess_cmds
[ Upstream commit 9b31a328e344e62e7cc98ae574edcb7b674719bb ]
Switch back to pre commit 1c7b13fe652 list splicing logic for active I/O
shutdown with tcm_qla2xxx + ib_srpt fabrics.
The original commit was done under the incorrect assumption that it's safe to
walk se_sess->sess_cmd_list unprotected in target_wait_for_sess_cmds() after
sess->sess_tearing_down = 1 has been set by target_sess_cmd_list_set_waiting()
during session shutdown.
So instead of adding sess->sess_cmd_lock protection around sess->sess_cmd_list
during target_wait_for_sess_cmds(), switch back to sess->sess_wait_list to
allow wait_for_completion() + TFO->release_cmd() to occur without having to
walk ->sess_cmd_list after the list_splice.
Also add a check to exit if target_sess_cmd_list_set_waiting() has already
been called, and add a WARN_ON to check for any fabric bug where new se_cmds
are added to sess->sess_cmd_list after sess->sess_tearing_down = 1 has already
been set.
Cc: Joern Engel <joern@logfs.org>
Cc: Roland Dreier <roland@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/target/target_core_base.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 5be89373ceac..71f76624f346 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -613,6 +613,7 @@ struct se_session { struct list_head sess_list; struct list_head sess_acl_list; struct list_head sess_cmd_list; + struct list_head sess_wait_list; spinlock_t sess_cmd_lock; struct kref sess_kref; }; |