|
@@ -2612,9 +2612,17 @@ static void set_discard_limits(struct cache *cache, struct queue_limits *limits)
|
|
|
static void cache_io_hints(struct dm_target *ti, struct queue_limits *limits)
|
|
|
{
|
|
|
struct cache *cache = ti->private;
|
|
|
+ uint64_t io_opt_sectors = limits->io_opt >> SECTOR_SHIFT;
|
|
|
|
|
|
- blk_limits_io_min(limits, 0);
|
|
|
- blk_limits_io_opt(limits, cache->sectors_per_block << SECTOR_SHIFT);
|
|
|
+ /*
|
|
|
+ * If the system-determined stacked limits are compatible with the
|
|
|
+ * cache's blocksize (io_opt is a factor) do not override them.
|
|
|
+ */
|
|
|
+ if (io_opt_sectors < cache->sectors_per_block ||
|
|
|
+ do_div(io_opt_sectors, cache->sectors_per_block)) {
|
|
|
+ blk_limits_io_min(limits, 0);
|
|
|
+ blk_limits_io_opt(limits, cache->sectors_per_block << SECTOR_SHIFT);
|
|
|
+ }
|
|
|
set_discard_limits(cache, limits);
|
|
|
}
|
|
|
|