diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-10-19 17:13:58 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-10-28 09:53:43 +0100 |
| commit | b1dd2aac4cc0892b82ec60232ed37e3b0af776cc (patch) | |
| tree | 393321bf7de6c136282ae8550cb8173f86b6b5a9 /include/scsi | |
| parent | e999dbc254044e8d2a5818d92d205f65bae28f37 (diff) | |
| download | linux-b1dd2aac4cc0892b82ec60232ed37e3b0af776cc.tar.gz linux-b1dd2aac4cc0892b82ec60232ed37e3b0af776cc.tar.bz2 linux-b1dd2aac4cc0892b82ec60232ed37e3b0af776cc.zip | |
scsi: set REQ_QUEUE for the blk-mq case
To generate the right SPI tag messages we need to properly set
QUEUE_FLAG_QUEUED in the request_queue and mirror it to the
request.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Reported-by: Meelis Roos <mroos@linux.ee>
Tested-by: Meelis Roos <mroos@linux.ee>
Cc: stable@vger.kernel.org
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_tcq.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h index e64583560701..56ed843969ca 100644 --- a/include/scsi/scsi_tcq.h +++ b/include/scsi/scsi_tcq.h @@ -67,8 +67,9 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth) if (!sdev->tagged_supported) return; - if (!shost_use_blk_mq(sdev->host) && - !blk_queue_tagged(sdev->request_queue)) + if (shost_use_blk_mq(sdev->host)) + queue_flag_set_unlocked(QUEUE_FLAG_QUEUED, sdev->request_queue); + else if (!blk_queue_tagged(sdev->request_queue)) blk_queue_init_tags(sdev->request_queue, depth, sdev->host->bqt); @@ -81,8 +82,7 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth) **/ static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth) { - if (!shost_use_blk_mq(sdev->host) && - blk_queue_tagged(sdev->request_queue)) + if (blk_queue_tagged(sdev->request_queue)) blk_queue_free_tags(sdev->request_queue); scsi_adjust_queue_depth(sdev, 0, depth); } |