Merge of the trunk's r2604:

Partially remove implicit ordered commands as a nonsense. It will be replaced by a common waiting facility to wait on depending previous commands to complete.



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2605 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-11-05 11:56:15 +00:00
parent 22eb9372bd
commit 80a0c4e095
3 changed files with 1 additions and 10 deletions

View File

@@ -154,7 +154,7 @@ enum scst_cdb_flags {
SCST_INFO_VALID = 0x0010, /* must be single bit */
SCST_VERIFY_BYTCHK_MISMATCH_ALLOWED = 0x0020,
SCST_IMPLICIT_HQ = 0x0040,
SCST_IMPLICIT_ORDERED = 0x0080,
SCST_IMPLICIT_ORDERED = 0x0080, /* ToDo: remove it's nonsense */
SCST_SKIP_UA = 0x0100,
SCST_WRITE_MEDIUM = 0x0200,
SCST_LOCAL_CMD = 0x0400,

View File

@@ -564,11 +564,6 @@ static inline bool scst_is_implicit_hq(struct scst_cmd *cmd)
return (cmd->op_flags & SCST_IMPLICIT_HQ) != 0;
}
static inline bool scst_is_implicit_ordered(struct scst_cmd *cmd)
{
return (cmd->op_flags & SCST_IMPLICIT_ORDERED) != 0;
}
/*
* Some notes on devices "blocking". Blocking means that no
* commands will go from SCST to underlying SCSI device until it

View File

@@ -438,7 +438,6 @@ static int scst_pre_parse(struct scst_cmd *cmd)
cmd->inc_expected_sn_on_done = 1;
#else
cmd->inc_expected_sn_on_done = dev->handler->exec_sync ||
scst_is_implicit_ordered(cmd) ||
(!dev->has_own_order_mgmt &&
(dev->queue_alg == SCST_CONTR_MODE_QUEUE_ALG_RESTRICTED_REORDER ||
cmd->queue_type == SCST_CMD_QUEUE_ORDERED));
@@ -3644,9 +3643,6 @@ static void scst_cmd_set_sn(struct scst_cmd *cmd)
cmd->queue_type = SCST_CMD_QUEUE_HEAD_OF_QUEUE;
}
if (unlikely(scst_is_implicit_ordered(cmd)))
cmd->queue_type = SCST_CMD_QUEUE_ORDERED;
EXTRACHECKS_BUG_ON(cmd->sn_set || cmd->hq_cmd_inced);
/* Optimized for lockless fast path */