From: Mike Snitzer Date: Tue, 5 Dec 2017 04:28:32 +0000 (-0500) Subject: dm: set QUEUE_FLAG_DAX accordingly in dm_table_set_restrictions() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ad3793fc3945173f64d82d05d3ecde41f6c0435c;p=openwrt%2Fstaging%2Fblogic.git dm: set QUEUE_FLAG_DAX accordingly in dm_table_set_restrictions() Rather than having DAX support be unique by setting it based on table type in dm_setup_md_queue(). Signed-off-by: Mike Snitzer --- diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 7b22cc8d30f4..504e79bc3a55 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1823,6 +1823,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 4e7682afebfa..308d178fff73 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2034,9 +2034,6 @@ int dm_setup_md_queue(struct mapped_device *md, struct dm_table *t) case DM_TYPE_DAX_BIO_BASED: dm_init_normal_md_queue(md); blk_queue_make_request(md->queue, dm_make_request); - - 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);