dm: set QUEUE_FLAG_DAX accordingly in dm_table_set_restrictions()

BugLink: http://bugs.launchpad.net/bugs/1808399
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index ca69a545e51a4340efd773835fa511066d4bccf0..d3301f3b18c000c86104fd163ef1b35593ee357e 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1820,6 +1820,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 6ce83e619663fcdbe6d4501a89f48580feb72742..54e3b2317e7da01d3a68da4bc3d517d4493ddf77 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2055,9 +2055,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);