Commit 0f702033 authored by Bo Liu's avatar Bo Liu Committed by Dan Williams
Browse files

dax: Remove usage of the deprecated ida_simple_xxx API 



ida_alloc_max() makes it clear that the second argument is inclusive,
and the alloc/free terminology is more idiomatic and symmetric then
get/remove.

Signed-off-by: default avatarBo Liu <liubo03@inspur.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/20220926012635.3205-1-liubo03@inspur.com


[djbw: reword changelog]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 2e5021cc

drivers/dax/super.c

+3 −3
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static void dax_free_inode(struct inode *inode) 
{

	struct dax_device *dax_dev = to_dax_dev(inode);

	if (inode->i_rdev)

		ida_simple_remove(&dax_minor_ida, iminor(inode));

		ida_free(&dax_minor_ida, iminor(inode));

	kmem_cache_free(dax_cache, dax_dev);

}
@@ -445,7 +445,7 @@ struct dax_device *alloc_dax(void *private, const struct dax_operations *ops) 
	if (WARN_ON_ONCE(ops && !ops->zero_page_range))

		return ERR_PTR(-EINVAL);



	minor = ida_simple_get(&dax_minor_ida, 0, MINORMASK+1, GFP_KERNEL);

	minor = ida_alloc_max(&dax_minor_ida, MINORMASK, GFP_KERNEL);

	if (minor < 0)

		return ERR_PTR(-ENOMEM);
@@ -459,7 +459,7 @@ struct dax_device *alloc_dax(void *private, const struct dax_operations *ops) 
	return dax_dev;



 err_dev:

	ida_simple_remove(&dax_minor_ida, minor);

	ida_free(&dax_minor_ida, minor);

	return ERR_PTR(-ENOMEM);

}

EXPORT_SYMBOL_GPL(alloc_dax);