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

Partial merge of the trunk's r3203:

Browse Source 
Returning of DIRECT contexts by scst_estimate_context() disabled (see comment in the patch why)



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@3204 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2011-01-10 18:39:41 +00:00
parent 455a696228
commit d906b4ab62
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scst/include/scst.h
View File

@@ -2705,25 +2705,37 @@ static inline bool scst_cmd_prelim_completed(struct scst_cmd *cmd)
return cmd->completed || test_bit(SCST_CMD_ABORTED, &cmd->cmd_flags);
}
static inline enum scst_exec_context __scst_estimate_context(bool direct)
static inline enum scst_exec_context __scst_estimate_context(bool atomic)
{
if (in_irq())
return SCST_CONTEXT_TASKLET;
/*
* We come here from many non reliable places, like the block layer, and don't
* have any reliable way to detect if we called under atomic context or not
* (in_atomic() isn't reliable), so let's be safe and disable this section
* for now to unconditionally return thread context.
*/
#if 0
else if (irqs_disabled())
return SCST_CONTEXT_THREAD;
else if (in_atomic())
return SCST_CONTEXT_DIRECT_ATOMIC;
else
return direct ? SCST_CONTEXT_DIRECT :
return atomic ? SCST_CONTEXT_DIRECT :
SCST_CONTEXT_DIRECT_ATOMIC;
#else
return SCST_CONTEXT_THREAD;
#endif
}
static inline enum scst_exec_context scst_estimate_context(void)
{
return __scst_estimate_context(0);
return __scst_estimate_context(false);
}
static inline enum scst_exec_context scst_estimate_context_direct(void)
static inline enum scst_exec_context scst_estimate_context_atomic(void)
{
return __scst_estimate_context(1);
return __scst_estimate_context(true);
}
/* Returns cmd's CDB */

2
scst_local/scst_local.c
View File

@@ -1058,7 +1058,7 @@ static int scst_local_queuecommand(struct scsi_cmnd *SCpnt,
{
struct Scsi_Host *h = SCpnt->device->host;
spin_unlock_irq(h->host_lock);
scst_cmd_init_done(scst_cmd, scst_estimate_context_direct());
scst_cmd_init_done(scst_cmd, scst_estimate_context_atomic());
spin_lock_irq(h->host_lock);
}
#else