diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-02-01 20:27:02 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-02-01 20:27:02 -0700 |
| commit | 3c15f3f545afa320c5e3822825a9a53c664776b6 (patch) | |
| tree | c6e0a7d7299e8012c2bf77e396aae40455d77d13 /drivers/scsi/scsi_lib.c | |
| parent | 4bf772b14675411a69b3c807f73006de0fe4b649 (diff) | |
| parent | bea99a500773fdfdb16b7dbfbaa00af7a6f0dc3b (diff) | |
Merge branch 'for-linus' into test
* for-linus:
blk-mq-sched: Enable merging discard bio into request
blk-mq: fix discard merge with scheduler attached
blk-mq: introduce BLK_STS_DEV_RESOURCE
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 976c936029cb..9bdf9200cacb 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2046,9 +2046,9 @@ out_put_budget: case BLK_STS_OK: break; case BLK_STS_RESOURCE: - if (atomic_read(&sdev->device_busy) == 0 && - !scsi_device_blocked(sdev)) - blk_mq_delay_run_hw_queue(hctx, SCSI_QUEUE_DELAY); + if (atomic_read(&sdev->device_busy) || + scsi_device_blocked(sdev)) + ret = BLK_STS_DEV_RESOURCE; break; default: /* |