From patchwork Wed Mar 27 19:29:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 2352871 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6CFAEE00E6 for ; Wed, 27 Mar 2013 19:29:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754308Ab3C0T3t (ORCPT ); Wed, 27 Mar 2013 15:29:49 -0400 Received: from mail-oa0-f41.google.com ([209.85.219.41]:46101 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754287Ab3C0T3s (ORCPT ); Wed, 27 Mar 2013 15:29:48 -0400 Received: by mail-oa0-f41.google.com with SMTP id f4so6765009oah.0 for ; Wed, 27 Mar 2013 12:29:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=lvPZWf3kljZEAyZM39gYez8Iq0NIQWfGGO50m5uN0kY=; b=QVZNFXBv98uXfZGpk8mirBpsQdNx/+zCyeeCRPZUvC/YKf+/hs4tLGa650mGv/z/+q osZoWWzDzryMgOF9DP5plC+E+emP1MEywy2naYJQ7SJSWs6wp4Ytf/CuwZ5/Vb+eE3qa JJ9rYvIA25jmllhZaB8bs9UcmWJSiafnaOJhPAKvmuXuxcvmnFVMnCIAfwkSyY+4EEB9 HFpGXP8jt6X3PudXxILl5zsP4PPQkwmtEVDKYtoy8Z6kR3yG2en0PTPHyJh3TvyDzPJe 6xzSPl98Gd2qn4mXL8RAR2TA/3WoNRJadycy8AEYVOaxM37UwfUqJnRK87UZ5o7XvzED ubUQ== X-Received: by 10.182.241.134 with SMTP id wi6mr4367231obc.46.1364412587576; Wed, 27 Mar 2013 12:29:47 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-113-143.nc.res.rr.com. [107.15.113.143]) by mx.google.com with ESMTPS id t9sm21559418obk.13.2013.03.27.12.29.46 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 27 Mar 2013 12:29:47 -0700 (PDT) From: Jeff Layton To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, tj@kernel.org, "J. Bruce Fields" , linux-nfs@vger.kernel.org Subject: [PATCH v2 4/6] nfsd: convert nfs4_alloc_stid to use idr_alloc_cyclic Date: Wed, 27 Mar 2013 15:29:36 -0400 Message-Id: <1364412578-7462-5-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1364412578-7462-1-git-send-email-jlayton@redhat.com> References: <1364412578-7462-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQmiarjz+YODiZF9AEDGPtAekFChdazOTjaNivmfjGPmYt7JySvyxD5Aqqqasif9TndUpyZc Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton Cc: "J. Bruce Fields" Cc: linux-nfs@vger.kernel.org --- fs/nfsd/nfs4state.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 2e27430..417c848 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);