Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / md / dm.c

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 06263b0..56aa2a8 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2057,6 +2057,7 @@ static void cleanup_mapped_device(struct mapped_device *md)
 static struct mapped_device *alloc_dev(int minor)
 {
        int r, numa_node_id = dm_get_numa_node();
+       struct dax_device *dax_dev;
        struct mapped_device *md;
        void *old_md;
 
@@ -2125,15 +2126,15 @@ static struct mapped_device *alloc_dev(int minor)
        md->disk->private_data = md;
        sprintf(md->disk->disk_name, "dm-%d", minor);
 
-       if (IS_ENABLED(CONFIG_FS_DAX)) {
-               md->dax_dev = alloc_dax(md, &dm_dax_ops);
-               if (IS_ERR(md->dax_dev)) {
-                       md->dax_dev = NULL;
+       dax_dev = alloc_dax(md, &dm_dax_ops);
+       if (IS_ERR(dax_dev)) {
+               if (PTR_ERR(dax_dev) != -EOPNOTSUPP)
                        goto bad;
-               }
-               set_dax_nocache(md->dax_dev);
-               set_dax_nomc(md->dax_dev);
-               if (dax_add_host(md->dax_dev, md->disk))
+       } else {
+               set_dax_nocache(dax_dev);
+               set_dax_nomc(dax_dev);
+               md->dax_dev = dax_dev;
+               if (dax_add_host(dax_dev, md->disk))
                        goto bad;
        }