From 77d994024258a327e5484aa10792ad2ccbf279c1 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 24 Apr 2014 00:07:22 +0000 Subject: [PATCH] Cleanups git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5463 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 6 +++--- scst/src/scst_targ.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index b90f82447..76928c722 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -5759,8 +5759,8 @@ void scst_free_cmd(struct scst_cmd *cmd) } if (likely(cmd->tgt_dev != NULL)) { - EXTRACHECKS_BUG_ON(!test_bit(SCST_CMD_INC_EXPECTED_SN_PASSED, - &cmd->cmd_flags) && cmd->sn_set && !cmd->out_of_sn); + EXTRACHECKS_BUG_ON(cmd->sn_set && !cmd->out_of_sn && + !test_bit(SCST_CMD_INC_EXPECTED_SN_PASSED, &cmd->cmd_flags)); if (unlikely(cmd->out_of_sn)) { destroy = test_and_set_bit(SCST_CMD_CAN_BE_DESTROYED, &cmd->cmd_flags); @@ -8009,7 +8009,7 @@ void scst_process_reset(struct scst_device *dev, dev->dev_double_ua_possible = 1; list_for_each_entry(tgt_dev, &dev->dev_tgt_dev_list, - dev_tgt_dev_list_entry) { + dev_tgt_dev_list_entry) { struct scst_session *sess = tgt_dev->sess; #if 0 /* Clearing UAs and last sense isn't required by SAM and it diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index ff80f55d1..39a17534d 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -3294,7 +3294,7 @@ static int scst_exec_check_sn(struct scst_cmd **active_cmd) if (unlikely(cmd->queue_type == SCST_CMD_QUEUE_HEAD_OF_QUEUE)) goto exec; - sBUG_ON(!cmd->sn_set); + EXTRACHECKS_BUG_ON(!cmd->sn_set); expected_sn = ACCESS_ONCE(order_data->expected_sn); /* Optimized for lockless fast path */