nfsd: convert nfs4_alloc_stid() to use idr_alloc_cyclic()

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 1 insertions, 6 deletions

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 2e27430b9070..417c84877742 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -234,7 +234,6 @@ static struct nfs4_stid *nfs4_alloc_stid(struct nfs4_client *cl, struct
 kmem_cache *slab)
 {
         struct idr *stateids = &cl->cl_stateids;
-        static int min_stateid = 0;
         struct nfs4_stid *stid;
         int new_id;
 
@@ -242,7 +241,7 @@ kmem_cache *slab)
         if (!stid)
                 return NULL;
 
-        new_id = idr_alloc(stateids, stid, min_stateid, 0, GFP_KERNEL);
+        new_id = idr_alloc_cyclic(stateids, stid, 0, 0, GFP_KERNEL);
         if (new_id < 0)
                 goto out_free;
         stid->sc_client = cl;
@@ -261,10 +260,6 @@ kmem_cache *slab)
          * amount of time until an id is reused, by ensuring they always
          * "increase" (mod INT_MAX):
          */
-
-        min_stateid = new_id+1;
-        if (min_stateid == INT_MAX)
-                min_stateid = 0;
         return stid;
 out_free:
         kfree(stid);