---

yaml --- r: 361286 b: refs/heads/master c: ebd6c70 h: refs/heads/master v: v3
git-mirror · Mar 13, 2013 · ab00d75 · ab00d75
1 parent 09bd6cb
commit ab00d75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 801cb2d62d5f673ac671c01397956d8b77a5215b
+refs/heads/master: ebd6c70714f5eda9cd1b60d23754ffd1d62481f6
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
@@ -242,9 +242,8 @@ kmem_cache *slab)
 	if (!stid)
 		return NULL;
 
-	if (!idr_pre_get(stateids, GFP_KERNEL))
-		goto out_free;
-	if (idr_get_new_above(stateids, stid, min_stateid, &new_id))
+	new_id = idr_alloc(stateids, stid, min_stateid, 0, GFP_KERNEL);
+	if (new_id < 0)
 		goto out_free;
 	stid->sc_client = cl;
 	stid->sc_type = 0;