diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2020-09-29 22:27:21 +0200 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2020-09-29 22:31:35 +0200 |
| commit | 1471308fb5ec4335f9ae9fc65f65048dbe7c336e (patch) | |
| tree | 69aef90f47105e1c730e5277f352d3d5446a1174 /drivers/md/bcache/super.c | |
| parent | dm crypt: document encrypted keyring key option (diff) | |
| parent | block-mq: fix comments in blk_mq_queue_tag_busy_iter (diff) | |
| download | linux-1471308fb5ec4335f9ae9fc65f65048dbe7c336e.tar.xz linux-1471308fb5ec4335f9ae9fc65f65048dbe7c336e.zip | |
Merge remote-tracking branch 'jens/for-5.10/block' into dm-5.10
DM depends on these block 5.10 commits:
22ada802ede8 block: use lcm_not_zero() when stacking chunk_sectors
07d098e6bbad block: allow 'chunk_sectors' to be non-power-of-2
021a24460dc2 block: add QUEUE_FLAG_NOWAIT
6abc49468eea dm: add support for REQ_NOWAIT and enable it for linear target
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/bcache/super.c')
| -rw-r--r-- | drivers/md/bcache/super.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 1bbdc410ee3c..6bfa77167362 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1427,9 +1427,8 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size) if (ret) return ret; - dc->disk.disk->queue->backing_dev_info->ra_pages = - max(dc->disk.disk->queue->backing_dev_info->ra_pages, - q->backing_dev_info->ra_pages); + blk_queue_io_opt(dc->disk.disk->queue, + max(queue_io_opt(dc->disk.disk->queue), queue_io_opt(q))); atomic_set(&dc->io_errors, 0); dc->io_disable = false; |