diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2017-12-04 23:28:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-11 16:29:23 +0200 |
| commit | 0605fa6daa6642c276ef037b3246595e4de53491 (patch) | |
| tree | 9fcb200c28c58eb256c92cb939125ac88c7a5c57 | |
| parent | 3729e5561e1e4a0319a2c794d8ae78b8baea4a36 (diff) | |
dm: set QUEUE_FLAG_DAX accordingly in dm_table_set_restrictions()
commit ad3793fc3945173f64d82d05d3ecde41f6c0435c upstream.
Rather than having DAX support be unique by setting it based on table
type in dm_setup_md_queue().
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/md/dm-table.c | 2 | ||||
| -rw-r--r-- | drivers/md/dm.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 4287fc9f3527..94849435c487 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1813,6 +1813,8 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, } blk_queue_write_cache(q, wc, fua); + if (dm_table_supports_dax(t)) + queue_flag_set_unlocked(QUEUE_FLAG_DAX, q); if (dm_table_supports_dax_write_cache(t)) dax_write_cache(t->md->dax_dev, true); diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 1dfc855ac708..b721f0a16711 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2050,9 +2050,6 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) */ bioset_free(md->queue->bio_split); md->queue->bio_split = NULL; - - if (type == DM_TYPE_DAX_BIO_BASED) - queue_flag_set_unlocked(QUEUE_FLAG_DAX, md->queue); break; case DM_TYPE_NONE: WARN_ON_ONCE(true); |