Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1c36b16 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

vfio: convert to idr_alloc() 



Convert to the much saner new idr interface.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d770931

drivers/vfio/vfio.c

+1 −16
Original line number Diff line number Diff line
@@ -139,23 +139,8 @@ EXPORT_SYMBOL_GPL(vfio_unregister_iommu_driver); 
 */

static int vfio_alloc_group_minor(struct vfio_group *group)

{

	int ret, minor;



again:

	if (unlikely(idr_pre_get(&vfio.group_idr, GFP_KERNEL) == 0))

		return -ENOMEM;



	/* index 0 is used by /dev/vfio/vfio */

	ret = idr_get_new_above(&vfio.group_idr, group, 1, &minor);

	if (ret == -EAGAIN)

		goto again;

	if (ret || minor > MINORMASK) {

		if (minor > MINORMASK)

			idr_remove(&vfio.group_idr, minor);

		return -ENOSPC;

	}



	return minor;

	return idr_alloc(&vfio.group_idr, group, 1, MINORMASK + 1, GFP_KERNEL);

}



static void vfio_free_group_minor(int minor)