diff --git a/scst/include/scst.h b/scst/include/scst.h index 442e455d6..af0f82aca 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -1368,9 +1368,6 @@ struct scst_device { /* Set if dev is RESERVED */ unsigned short dev_reserved:1; - /* Set if dev accepts only one command at time */ - unsigned short dev_serialized:1; - /* Set if double reset UA is possible */ unsigned short dev_double_ua_possible:1; diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 9cf80fa9c..b98bfa011 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -318,7 +318,6 @@ int scst_alloc_device(gfp_t gfp_mask, struct scst_device **out_dev) INIT_LIST_HEAD(&dev->threads_list); init_waitqueue_head(&dev->on_dev_waitQ); dev->dev_double_ua_possible = 1; - dev->dev_serialized = 1; dev->queue_alg = SCST_CONTR_MODE_QUEUE_ALG_UNRESTRICTED_REORDER; dev->dev_num = dev_num++; @@ -2740,7 +2739,6 @@ void scst_process_reset(struct scst_device *dev, } dev->dev_double_ua_possible = 1; - dev->dev_serialized = 1; list_for_each_entry(tgt_dev, &dev->dev_tgt_dev_list, dev_tgt_dev_list_entry) { @@ -3219,8 +3217,8 @@ repeat: goto out_unlock; if (dev->block_count > 0) { scst_dec_on_dev_cmd(cmd); - TRACE_MGMT_DBG("Delaying cmd %p due to blocking or " - "serializing (tag %llu, dev %p)", cmd, + TRACE_MGMT_DBG("Delaying cmd %p due to blocking " + "(tag %llu, dev %p)", cmd, (long long unsigned int)cmd->tag, dev); list_add_tail(&cmd->blocked_cmd_list_entry, &dev->blocked_cmd_list); @@ -3233,12 +3231,12 @@ repeat: } spin_unlock_bh(&dev->dev_lock); } - if (unlikely(dev->dev_serialized)) { + if (unlikely(dev->dev_double_ua_possible)) { spin_lock_bh(&dev->dev_lock); if (dev->block_count == 0) { TRACE_MGMT_DBG("cmd %p (tag %llu), blocking further " - "cmds due to serializing (dev %p)", cmd, - (long long unsigned int)cmd->tag, dev); + "cmds due to possible double reset UA (dev %p)", + cmd, (long long unsigned int)cmd->tag, dev); __scst_block_dev(dev); cmd->inc_blocking = 1; } else { diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 500e5a0a8..57ea9d2f7 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -2299,13 +2299,12 @@ static int scst_check_sense(struct scst_cmd *cmd) "cmd %p)", dev, cmd); /* * Lock used to protect other flags in the bitfield - * (just in case, actually). Those 2 flags can't be + * (just in case, actually). Those flags can't be * changed in parallel, because the device is * serialized. */ spin_lock_bh(&dev->dev_lock); dev->dev_double_ua_possible = 0; - dev->dev_serialized = 0; spin_unlock_bh(&dev->dev_lock); } }