From patchwork Mon Jun 30 15:49:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4451521 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B9D8EBEEAA for ; Mon, 30 Jun 2014 15:51:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6C72201C0 for ; Mon, 30 Jun 2014 15:51:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0EB352021F for ; Mon, 30 Jun 2014 15:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754458AbaF3Pvh (ORCPT ); Mon, 30 Jun 2014 11:51:37 -0400 Received: from mail-qa0-f51.google.com ([209.85.216.51]:56736 "EHLO mail-qa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897AbaF3Pvg (ORCPT ); Mon, 30 Jun 2014 11:51:36 -0400 Received: by mail-qa0-f51.google.com with SMTP id j7so6678535qaq.10 for ; Mon, 30 Jun 2014 08:51:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Gf651hMGARlCpdOO1ed76UQ1cEvjPIdGTZE0PicXSys=; b=b8wZGeLYP7apgziG7Tb/rmkfpASWa8yySoDBKmkGkNntg+Z85ROgPVOQpEyi1u6F3W zz/3dovDQbSFL3uu/bICkDoGyUPYqRimiQ/0zi9TUnlZ/BIWXe/zyschbZElZVFZQ7m0 HNIUhbLEIJG1fL6bas+rMUf9FmZj3xBXe/5SHXq+4aE6Dk9Dj0HHXrGyMaRs5XFCrcly UX0g+CCGGhUNXdHax9Vc1Cro7gd/oKWsks0GOe1HnPwI4GZ53uS8W1spdqjF9QDJxE3x V8cUvio91lSijBbnPtlmZeBvRocj44VuJVPGvroEIb9hvICCWpgOvPjXH4JmAWuCn2Ph bojQ== X-Gm-Message-State: ALoCoQmncmgnUswLdu6dxa9DFf4Y3aXjZhSU9P0Ldv/vy+Rpxcyww1i5/mQII+RxDzkdTeg+haPL X-Received: by 10.224.13.82 with SMTP id b18mr24504978qaa.8.1404143496048; Mon, 30 Jun 2014 08:51:36 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id m1sm32584105qaz.27.2014.06.30.08.51.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jun 2014 08:51:35 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v3 045/114] nfsd: Convert delegation counter to an atomic_long_t type Date: Mon, 30 Jun 2014 11:49:14 -0400 Message-Id: <1404143423-24381-46-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> References: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Trond Myklebust We want to convert to an atomic type so that we don't need to lock across the call to alloc_init_deleg(). Then convert to a long type so that we match the size of 'max_delegations'. None of this is a problem today, but it will be once we remove client_mutex protection. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 60cc162cc8a5..f5865a8e3081 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -313,7 +313,7 @@ static struct file *find_any_file(struct nfs4_file *f) return ret; } -static int num_delegations; +static atomic_long_t num_delegations; unsigned long max_delegations; /* @@ -504,7 +504,7 @@ static struct nfs4_ol_stateid * nfs4_alloc_stateid(struct nfs4_client *clp) static void nfs4_free_deleg(struct nfs4_stid *stid) { nfs4_free_stid(deleg_slab, stid); - num_delegations--; + atomic_long_dec(&num_delegations); } /* @@ -584,15 +584,17 @@ static struct nfs4_delegation * alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct svc_fh *current_fh) { struct nfs4_delegation *dp; + long n; dprintk("NFSD alloc_init_deleg\n"); - if (num_delegations > max_delegations) - return NULL; + n = atomic_long_inc_return(&num_delegations); + if (n < 0 || n > max_delegations) + goto out_dec; if (delegation_blocked(¤t_fh->fh_handle)) - return NULL; + goto out_dec; dp = delegstateid(nfs4_alloc_stid(clp, deleg_slab)); if (dp == NULL) - return dp; + goto out_dec; dp->dl_stid.sc_free = nfs4_free_deleg; /* @@ -601,13 +603,15 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv * 0 anyway just for consistency and use 1: */ dp->dl_stid.sc_stateid.si_generation = 1; - num_delegations++; INIT_LIST_HEAD(&dp->dl_perfile); INIT_LIST_HEAD(&dp->dl_perclnt); INIT_LIST_HEAD(&dp->dl_recall_lru); dp->dl_type = NFS4_OPEN_DELEGATE_READ; fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); return dp; +out_dec: + atomic_long_dec(&num_delegations); + return NULL; } static void remove_stid_locked(struct nfs4_client *clp, struct nfs4_stid *s)