Merge of the missed commits r3447,3452,3458 from the trunk.

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3559 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2011-06-08 21:27:00 +00:00
parent 593a7b0fe3
commit fa37fa3f1b
4 changed files with 52 additions and 22 deletions
+13
View File
@@ -1888,6 +1888,12 @@ struct scst_cmd {
*/
unsigned int finished:1;
/*
* Set if scst_check_local_events() can be called more than once. Set by
* scst_pre_check_local_events().
*/
unsigned int check_local_events_once_done:1;
#ifdef CONFIG_SCST_DEBUG_TM
/* Set if the cmd was delayed by task management debugging code */
unsigned int tm_dbg_delayed:1;
@@ -3789,6 +3795,13 @@ void scst_post_alloc_data_buf(struct scst_cmd *cmd);
int scst_check_local_events(struct scst_cmd *cmd);
static inline int scst_pre_check_local_events(struct scst_cmd *cmd)
{
int res = scst_check_local_events(cmd);
cmd->check_local_events_once_done = 1;
return res;
}
int scst_set_cmd_abnormal_done_state(struct scst_cmd *cmd);
struct scst_trace_log {