Commit 30c6828a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dan Williams
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/20211215084508.435401-4-hch@lst.de


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent fd1d00ec

drivers/dax/bus.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/dax/super.c

+1 −5
Original line number Diff line number Diff line
@@ -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:

drivers/md/dm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/nvdimm/pmem.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

drivers/s390/block/dcssblk.c

+2 −2
Original line number Diff line number Diff line
@@ -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;