From patchwork Thu Jun 26 19:12:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4430611 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AC5389F2C8 for ; Thu, 26 Jun 2014 19:14:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3759201BB for ; Thu, 26 Jun 2014 19:14:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0CD32024D for ; Thu, 26 Jun 2014 19:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751798AbaFZTOy (ORCPT ); Thu, 26 Jun 2014 15:14:54 -0400 Received: from mail-qa0-f48.google.com ([209.85.216.48]:60724 "EHLO mail-qa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751511AbaFZTOx (ORCPT ); Thu, 26 Jun 2014 15:14:53 -0400 Received: by mail-qa0-f48.google.com with SMTP id x12so3210830qac.35 for ; Thu, 26 Jun 2014 12:14:52 -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=pqxPman4J3x7rM/CFejrQmgy3UyF5ZbNXD3WuRr7YlE=; b=ZqIQb2468k6BEFm4e33zlg2C785wl6UewEAEvRgLeCVSU5yN25hRbZw52ZbzWNXGxO ZXnv+AQleboEMpn8rB+7BVwAfjZrY4y5hKT/fVI0h3fvJK6iH+HsKe1HzFjvfN/YncVu vKjvjMza4rHJIXwLsbtV9BVuAQ4Nw2PhSYNdGDz+NIe0CX31cU8D7ki+AU3VfOaDoXLY fLOBRRje2ft/CaQyjBJJ5GNjh0nzztOmMYs3bhz8K8IaMvE5BYxZ1Mk5AoSwehJrnSWB c9ut7G0saoBq7i2axw8BX6VoR21Trz2kx2D7lp6nW0flw69SufpgmknXNbwdudO2RXMs LhWQ== X-Gm-Message-State: ALoCoQnSChSO7yPyaH7LZiN9fdoaaNvOyUJaj5odAzdAof+LBo/l7qvGp2+lHM7ROo3y+f1kHXfF X-Received: by 10.140.51.175 with SMTP id u44mr23976906qga.69.1403810092757; Thu, 26 Jun 2014 12:14:52 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id 88sm4763039qgh.5.2014.06.26.12.14.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:14:51 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v2 049/117] nfsd: Convert delegation counter to an atomic_long_t type Date: Thu, 26 Jun 2014 15:12:29 -0400 Message-Id: <1403810017-16062-50-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403810017-16062-1-git-send-email-jlayton@primarydata.com> References: <1403810017-16062-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 6e918aa0829c..714273b942ce 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -338,7 +338,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; /* @@ -548,7 +548,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); } /* @@ -628,15 +628,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; /* @@ -645,13 +647,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)