From df44607942c6f023c1575140ed95b33f377c1794 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 27 Feb 2013 17:04:57 -0800
Subject: [PATCH] --- yaml --- r: 359377 b: refs/heads/master c:
 19a101a02ec65400233459ee7cef7037dbe8f15b h: refs/heads/master i:   359375:
 edb997b664e5055e1941ceeac1e860651cf8398e v: v3

---
 [refs]              |  2 +-
 trunk/net/9p/util.c | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a0a8d92cc93f..f4d55bc1dd59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee94d523bf92d3b8b2de166943d48ac7fd695e10
+refs/heads/master: 19a101a02ec65400233459ee7cef7037dbe8f15b
diff --git a/trunk/net/9p/util.c b/trunk/net/9p/util.c
index 6ceeeb384de7..59f278e64f58 100644
--- a/trunk/net/9p/util.c
+++ b/trunk/net/9p/util.c
@@ -87,23 +87,18 @@ EXPORT_SYMBOL(p9_idpool_destroy);
 
 int p9_idpool_get(struct p9_idpool *p)
 {
-	int i = 0;
-	int error;
+	int i;
 	unsigned long flags;
 
-retry:
-	if (idr_pre_get(&p->pool, GFP_NOFS) == 0)
-		return -1;
-
+	idr_preload(GFP_NOFS);
 	spin_lock_irqsave(&p->lock, flags);
 
 	/* no need to store exactly p, we just need something non-null */
-	error = idr_get_new(&p->pool, p, &i);
-	spin_unlock_irqrestore(&p->lock, flags);
+	i = idr_alloc(&p->pool, p, 0, 0, GFP_NOWAIT);
 
-	if (error == -EAGAIN)
-		goto retry;
-	else if (error)
+	spin_unlock_irqrestore(&p->lock, flags);
+	idr_preload_end();
+	if (i < 0)
 		return -1;
 
 	p9_debug(P9_DEBUG_MUX, " id %d pool %p\n", i, p);