From b9dfda96ae4b3dd1b008d26ad7bb11add63a775d Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Sat, 17 Jun 2006 20:37:40 -0700
Subject: [PATCH] --- yaml --- r: 27639 b: refs/heads/master c:
 3463175d6ee55fdbd5cda2a03415e2068599b2b7 h: refs/heads/master i:   27637:
 b3ac05f7a61d1023dd7d3a2d17d77554b8e915a7   27635:
 8c2e2f87bab1f5b2e5ad98b02e437eaf5ac612bf   27631:
 b56c11cda0dd9ee1c3b57513973451b746eabfb4 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/infiniband/core/uverbs_cmd.c | 82 ++++++----------------
 2 files changed, 23 insertions(+), 61 deletions(-)

diff --git a/[refs] b/[refs]
index 3c2d8e2440a9..cd37eb501b93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b1582268e269b3a9e54e186e740396f0f2012b
+refs/heads/master: 3463175d6ee55fdbd5cda2a03415e2068599b2b7
diff --git a/trunk/drivers/infiniband/core/uverbs_cmd.c b/trunk/drivers/infiniband/core/uverbs_cmd.c
index 37824f68e377..403dd811ec7f 100644
--- a/trunk/drivers/infiniband/core/uverbs_cmd.c
+++ b/trunk/drivers/infiniband/core/uverbs_cmd.c
@@ -50,6 +50,22 @@
 		(udata)->outlen = (olen);				\
 	} while (0)
 
+static int idr_add_uobj(struct idr *idr, void *obj, struct ib_uobject *uobj)
+{
+	int ret;
+
+retry:
+	if (!idr_pre_get(idr, GFP_KERNEL))
+		return -ENOMEM;
+
+	ret = idr_get_new(idr, uobj, &uobj->id);
+
+	if (ret == -EAGAIN)
+		goto retry;
+
+	return ret;
+}
+
 ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,
 			      const char __user *buf,
 			      int in_len, int out_len)
@@ -295,16 +311,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file,
 
 	mutex_lock(&ib_uverbs_idr_mutex);
 
-retry:
-	if (!idr_pre_get(&ib_uverbs_pd_idr, GFP_KERNEL)) {
-		ret = -ENOMEM;
-		goto err_up;
-	}
-
-	ret = idr_get_new(&ib_uverbs_pd_idr, pd, &uobj->id);
-
-	if (ret == -EAGAIN)
-		goto retry;
+	ret = idr_add_uobj(&ib_uverbs_pd_idr, pd, uobj);
 	if (ret)
 		goto err_up;
 
@@ -458,16 +465,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
 	resp.lkey = mr->lkey;
 	resp.rkey = mr->rkey;
 
-retry:
-	if (!idr_pre_get(&ib_uverbs_mr_idr, GFP_KERNEL)) {
-		ret = -ENOMEM;
-		goto err_unreg;
-	}
-
-	ret = idr_get_new(&ib_uverbs_mr_idr, mr, &obj->uobject.id);
-
-	if (ret == -EAGAIN)
-		goto retry;
+	ret = idr_add_uobj(&ib_uverbs_mr_idr, mr, &obj->uobject);
 	if (ret)
 		goto err_unreg;
 
@@ -632,16 +630,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,
 
 	mutex_lock(&ib_uverbs_idr_mutex);
 
-retry:
-	if (!idr_pre_get(&ib_uverbs_cq_idr, GFP_KERNEL)) {
-		ret = -ENOMEM;
-		goto err_up;
-	}
-
-	ret = idr_get_new(&ib_uverbs_cq_idr, cq, &uobj->uobject.id);
-
-	if (ret == -EAGAIN)
-		goto retry;
+	ret = idr_add_uobj(&ib_uverbs_cq_idr, cq, &uobj->uobject);
 	if (ret)
 		goto err_up;
 
@@ -946,16 +935,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
 	memset(&resp, 0, sizeof resp);
 	resp.qpn = qp->qp_num;
 
-retry:
-	if (!idr_pre_get(&ib_uverbs_qp_idr, GFP_KERNEL)) {
-		ret = -ENOMEM;
-		goto err_destroy;
-	}
-
-	ret = idr_get_new(&ib_uverbs_qp_idr, qp, &uobj->uevent.uobject.id);
-
-	if (ret == -EAGAIN)
-		goto retry;
+	ret = idr_add_uobj(&ib_uverbs_qp_idr, qp, &uobj->uevent.uobject);
 	if (ret)
 		goto err_destroy;
 
@@ -1614,16 +1594,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
 
 	ah->uobject = uobj;
 
-retry:
-	if (!idr_pre_get(&ib_uverbs_ah_idr, GFP_KERNEL)) {
-		ret = -ENOMEM;
-		goto err_destroy;
-	}
-
-	ret = idr_get_new(&ib_uverbs_ah_idr, ah, &uobj->id);
-
-	if (ret == -EAGAIN)
-		goto retry;
+	ret = idr_add_uobj(&ib_uverbs_ah_idr, ah, uobj);
 	if (ret)
 		goto err_destroy;
 
@@ -1846,16 +1817,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,
 
 	memset(&resp, 0, sizeof resp);
 
-retry:
-	if (!idr_pre_get(&ib_uverbs_srq_idr, GFP_KERNEL)) {
-		ret = -ENOMEM;
-		goto err_destroy;
-	}
-
-	ret = idr_get_new(&ib_uverbs_srq_idr, srq, &uobj->uobject.id);
-
-	if (ret == -EAGAIN)
-		goto retry;
+	ret = idr_add_uobj(&ib_uverbs_srq_idr, srq, &uobj->uobject);
 	if (ret)
 		goto err_destroy;