mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 20:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes possible miss of UCMD_STATE_ON_FREEING event found by Erez Zilber <erezzi.list@gmail.com> + some cleanups

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@870 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2009-05-20 17:16:23 +00:00
parent 5266dcd63b
commit a53c13da95
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scst/src/dev_handlers/scst_user.c
View File

@@ -1044,12 +1044,10 @@ static void dev_user_add_to_ready(struct scst_user_cmd *ucmd)
{
struct scst_user_dev *dev = ucmd->dev;
unsigned long flags;
int do_wake;
int do_wake = in_interrupt();
TRACE_ENTRY();
do_wake = (in_interrupt() ||
(ucmd->state == UCMD_STATE_ON_CACHE_FREEING));
if (ucmd->cmd)
do_wake |= ucmd->cmd->preprocessing_only;
@@ -1072,7 +1070,6 @@ static void dev_user_add_to_ready(struct scst_user_cmd *ucmd)
"cmd list", ucmd, ucmd->state);
list_add(&ucmd->ready_cmd_list_entry,
&dev->ready_cmd_list);
do_wake = 1;
} else if (unlikely(ucmd->state == UCMD_STATE_TM_EXECING) ||
unlikely(ucmd->state == UCMD_STATE_ATTACH_SESS) ||
unlikely(ucmd->state == UCMD_STATE_DETACH_SESS)) {
@@ -1081,14 +1078,20 @@ static void dev_user_add_to_ready(struct scst_user_cmd *ucmd)
list_add(&ucmd->ready_cmd_list_entry,
&dev->ready_cmd_list);
do_wake = 1;
} else if ((ucmd->cmd != NULL) &&
unlikely((ucmd->cmd->queue_type == SCST_CMD_QUEUE_HEAD_OF_QUEUE))) {
TRACE_DBG("Adding HQ ucmd %p to head of ready cmd list", ucmd);
list_add(&ucmd->ready_cmd_list_entry, &dev->ready_cmd_list);
} else {
TRACE_DBG("Adding ucmd %p to ready cmd list", ucmd);
list_add_tail(&ucmd->ready_cmd_list_entry,
&dev->ready_cmd_list);
if ((ucmd->cmd != NULL) &&
unlikely((ucmd->cmd->queue_type == SCST_CMD_QUEUE_HEAD_OF_QUEUE))) {
TRACE_DBG("Adding HQ ucmd %p to head of ready cmd list",
ucmd);
list_add(&ucmd->ready_cmd_list_entry,
&dev->ready_cmd_list);
} else {
TRACE_DBG("Adding ucmd %p to ready cmd list", ucmd);
list_add_tail(&ucmd->ready_cmd_list_entry,
&dev->ready_cmd_list);
}
do_wake |= ((ucmd->state == UCMD_STATE_ON_CACHE_FREEING) ||
(ucmd->state == UCMD_STATE_ON_FREEING));
}
if (do_wake) {
@@ -2120,7 +2123,6 @@ static void dev_user_unjam_cmd(struct scst_user_cmd *ucmd, int busy,
case UCMD_STATE_TM_EXECING:
case UCMD_STATE_ATTACH_SESS:
case UCMD_STATE_DETACH_SESS:
{
if (flags != NULL)
spin_unlock_irqrestore(&dev->cmd_lists.cmd_list_lock,
*flags);
@@ -2153,7 +2155,6 @@ static void dev_user_unjam_cmd(struct scst_user_cmd *ucmd, int busy,
else
spin_lock_irq(&dev->cmd_lists.cmd_list_lock);
break;
}
default:
PRINT_CRIT_ERROR("Wrong ucmd state %x", state);

2
scst/src/scst_targ.c
View File

@@ -771,6 +771,8 @@ check:
prep_done:
if (cmd->preprocessing_only) {
cmd->preprocessing_only = 0;
if (unlikely(test_bit(SCST_CMD_ABORTED, &cmd->cmd_flags))) {
TRACE_MGMT_DBG("ABORTED set, returning ABORTED for "
"cmd %p", cmd);