dax: remove the DAXDEV_F_SYNC flag

Remove the DAXDEV_F_SYNC flag and thus the flags argument to alloc_dax and
just let the drivers call set_dax_synchronous directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/20211215084508.435401-4-hch@lst.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c
index 6683d42c32c56b975e7ed10a6064f1a6d4d42b2b..da2a14d096d29cabbbd2d551da4989047061a08b 100644 (file)
--- a/drivers/dax/bus.c
+++ b/drivers/dax/bus.c
@@ -1324,11 +1324,12 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data)
         * No dax_operations since there is no access to this device outside of
         * mmap of the resulting character device.
         */
-       dax_dev = alloc_dax(dev_dax, NULL, DAXDEV_F_SYNC);
+       dax_dev = alloc_dax(dev_dax, NULL);
        if (IS_ERR(dax_dev)) {
                rc = PTR_ERR(dax_dev);
                goto err_alloc_dax;
        }
+       set_dax_synchronous(dax_dev);
 
        /* a device_dax instance is dead while the driver is not attached */
        kill_dax(dax_dev);

diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index e18155f43a6357c34905d090315a64ab3d481849..e81d5ee57390f67b75ef9e95436d2c8f62f423cb 100644 (file)
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -345,8 +345,7 @@ static struct dax_device *dax_dev_get(dev_t devt)
        return dax_dev;
 }
 
-struct dax_device *alloc_dax(void *private, const struct dax_operations *ops,
-               unsigned long flags)
+struct dax_device *alloc_dax(void *private, const struct dax_operations *ops)
 {
        struct dax_device *dax_dev;
        dev_t devt;
@@ -366,9 +365,6 @@ struct dax_device *alloc_dax(void *private, const struct dax_operations *ops,
 
        dax_dev->ops = ops;
        dax_dev->private = private;
-       if (flags & DAXDEV_F_SYNC)
-               set_dax_synchronous(dax_dev);
-
        return dax_dev;
 
  err_dev:

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 4e997c02bb0a090e3deeab6197bff28aa27b0e18..f4b972af109280a92c249c4bdc321ef511562efe 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1765,7 +1765,7 @@ static struct mapped_device *alloc_dev(int minor)
        sprintf(md->disk->disk_name, "dm-%d", minor);
 
        if (IS_ENABLED(CONFIG_FS_DAX)) {
-               md->dax_dev = alloc_dax(md, &dm_dax_ops, 0);
+               md->dax_dev = alloc_dax(md, &dm_dax_ops);
                if (IS_ERR(md->dax_dev)) {
                        md->dax_dev = NULL;
                        goto bad;

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index d225bcfa67cf922657ce89336f34a63d67324dc4..18b1d9c5583130c7c5e7cbdea8c5f5012f6fae38 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -400,7 +400,6 @@ static int pmem_attach_disk(struct device *dev,
        struct gendisk *disk;
        void *addr;
        int rc;
-       unsigned long flags = 0UL;
 
        pmem = devm_kzalloc(dev, sizeof(*pmem), GFP_KERNEL);
        if (!pmem)
@@ -493,13 +492,13 @@ static int pmem_attach_disk(struct device *dev,
        nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_range);
        disk->bb = &pmem->bb;
 
-       if (is_nvdimm_sync(nd_region))
-               flags = DAXDEV_F_SYNC;
-       dax_dev = alloc_dax(pmem, &pmem_dax_ops, flags);
+       dax_dev = alloc_dax(pmem, &pmem_dax_ops);
        if (IS_ERR(dax_dev)) {
                rc = PTR_ERR(dax_dev);
                goto out;
        }
+       if (is_nvdimm_sync(nd_region))
+               set_dax_synchronous(dax_dev);
        rc = dax_add_host(dax_dev, disk);
        if (rc)
                goto out_cleanup_dax;

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index e65e83764d1ce5ea7f45ce7f21bfae780f90f460..10823debc09bdcbbd53aeec2025307995893f9f7 100644 (file)
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -686,13 +686,13 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
        if (rc)
                goto put_dev;
 
-       dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops,
-                       DAXDEV_F_SYNC);
+       dev_info->dax_dev = alloc_dax(dev_info, &dcssblk_dax_ops);
        if (IS_ERR(dev_info->dax_dev)) {
                rc = PTR_ERR(dev_info->dax_dev);
                dev_info->dax_dev = NULL;
                goto put_dev;
        }
+       set_dax_synchronous(dev_info->dax_dev);
        rc = dax_add_host(dev_info->dax_dev, dev_info->gd);
        if (rc)
                goto out_dax;

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index 242cc1c0d7ed7cc45874713dd71bc103ac332e45..5c03a0364a9bb24b31efb797862f8ebce5fe4393 100644 (file)
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -850,7 +850,7 @@ static int virtio_fs_setup_dax(struct virtio_device *vdev, struct virtio_fs *fs)
        dev_dbg(&vdev->dev, "%s: window kaddr 0x%px phys_addr 0x%llx len 0x%llx\n",
                __func__, fs->window_kaddr, cache_reg.addr, cache_reg.len);
 
-       fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops, 0);
+       fs->dax_dev = alloc_dax(fs, &virtio_fs_dax_ops);
        if (IS_ERR(fs->dax_dev))
                return PTR_ERR(fs->dax_dev);
 

diff --git a/include/linux/dax.h b/include/linux/dax.h
index 3bd1fdb5d5f4b2ec47a7b128d1f4beb39211b903..c04f46478e3b52773ae68175c44ef1a3459511eb 100644 (file)
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
@@ -6,9 +6,6 @@
 #include <linux/mm.h>
 #include <linux/radix-tree.h>
 
-/* Flag for synchronous flush */
-#define DAXDEV_F_SYNC (1UL << 0)
-
 typedef unsigned long dax_entry_t;
 
 struct dax_device;
@@ -42,8 +39,7 @@ struct dax_operations {
 };
 
 #if IS_ENABLED(CONFIG_DAX)
-struct dax_device *alloc_dax(void *private, const struct dax_operations *ops,
-               unsigned long flags);
+struct dax_device *alloc_dax(void *private, const struct dax_operations *ops);
 void put_dax(struct dax_device *dax_dev);
 void kill_dax(struct dax_device *dax_dev);
 void dax_write_cache(struct dax_device *dax_dev, bool wc);
@@ -64,7 +60,7 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,
 }
 #else
 static inline struct dax_device *alloc_dax(void *private,
-               const struct dax_operations *ops, unsigned long flags)
+               const struct dax_operations *ops)
 {
        /*
         * Callers should check IS_ENABLED(CONFIG_DAX) to know if this