--- drivers/scsi/scsi_lib.c

+++ drivers/scsi/scsi_lib.c

@@ -400,15 +400,10 @@ static inline int scsi_host_is_busy(stru

static void scsi_run_queue(struct request_queue *q)

{

struct scsi_device *sdev = q->queuedata;

- struct Scsi_Host *shost;

+ struct Scsi_Host *shost = sdev->host;

LIST_HEAD(starved_list);

unsigned long flags;

- /* if the device is dead, sdev will be NULL, so no queue to run */

- if (!sdev)

- return;

-

- shost = sdev->host;

if (scsi_target(sdev)->single_lun)

scsi_single_lun_run(sdev);

@@ -1641,8 +1636,9 @@ struct request_queue *__scsi_alloc_queue

blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));

+ /* New queue, no concurrency on queue_flags */

if (!shost->use_clustering)

- q->limits.cluster = 0;

+ queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q);

/*

* set a reasonable default alignment on word boundaries: the