From 90bb91dcfb7cd2e3aaf0b6a3574f3117886f501b Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 27 Feb 2013 17:04:48 -0800
Subject: [PATCH] --- yaml --- r: 359369 b: refs/heads/master c:
 a1c36b166be76763cfab1a4308a00d6ffd8a2cc0 h: refs/heads/master i:   359367:
 12fee83fd5a61b839761ac3ff9873bb7a0538fa1 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/vfio/vfio.c | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 4e8250f20645..e27dcf653aec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d770931291eec7e7be774a5272db28d29899a66
+refs/heads/master: a1c36b166be76763cfab1a4308a00d6ffd8a2cc0
diff --git a/trunk/drivers/vfio/vfio.c b/trunk/drivers/vfio/vfio.c
index 28e2d5b2c0c7..fcc12f3e60a3 100644
--- a/trunk/drivers/vfio/vfio.c
+++ b/trunk/drivers/vfio/vfio.c
@@ -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)