1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ee02d3838a0a..5bff8a2396e4 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1632,9 +1632,8 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
 
         blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));
 
-        /* New queue, no concurrency on queue_flags */
         if (!shost->use_clustering)
-                queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q);
+                q->limits.cluster = 0;
 
         /*
          * set a reasonable default alignment on word boundaries: the
@@ -2428,7 +2427,8 @@ scsi_internal_device_unblock(struct scsi_device *sdev)
                 sdev->sdev_state = SDEV_RUNNING;
         else if (sdev->sdev_state == SDEV_CREATED_BLOCK)
                 sdev->sdev_state = SDEV_CREATED;
-        else
+        else if (sdev->sdev_state != SDEV_CANCEL &&
+                 sdev->sdev_state != SDEV_OFFLINE)
                 return -EINVAL;
 
         spin_lock_irqsave(q->queue_lock, flags);