diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2017-11-16 15:42:26 -0500 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2017-11-16 16:33:55 -0500 |
| commit | 5d47c89f29eab6e9e224d7ac8c0baf4da72c9493 (patch) | |
| tree | b5e99cfda4c152744acffce72df6d9508192cf93 /drivers | |
| parent | 7dea378b23fdc5003379615fc579dbf987ed8128 (diff) | |
| download | linux-stable-5d47c89f29eab6e9e224d7ac8c0baf4da72c9493.tar.gz linux-stable-5d47c89f29eab6e9e224d7ac8c0baf4da72c9493.tar.bz2 linux-stable-5d47c89f29eab6e9e224d7ac8c0baf4da72c9493.zip | |
dm: clear all discard attributes in queue_limits when discards are disabled
Otherwise, it can happen that the QUEUE_FLAG_DISCARD isn't set but the
various discard attributes (which get exposed via sysfs) may be set.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm-table.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 6f1ec12c287c..3acf8f56eb64 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1801,9 +1801,15 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, */ q->limits = *limits; - if (!dm_table_supports_discards(t)) + if (!dm_table_supports_discards(t)) { queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q); - else + /* Must also clear discard limits... */ + q->limits.max_discard_sectors = 0; + q->limits.max_hw_discard_sectors = 0; + q->limits.discard_granularity = 0; + q->limits.discard_alignment = 0; + q->limits.discard_misaligned = 0; + } else queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); if (dm_table_supports_flush(t, (1UL << QUEUE_FLAG_WC))) { |