diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index e7b4f477a..b5918b6f3 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -160,7 +160,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, diff --git a/scst/src/scst_priv.h b/scst/src/scst_priv.h index 31c61555a..f3c15cbea 100644 --- a/scst/src/scst_priv.h +++ b/scst/src/scst_priv.h @@ -541,11 +541,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 diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index d71b8c37c..4fd825c64 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -420,7 +420,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)); @@ -3564,9 +3563,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 */