From patchwork Fri Jul 25 11:34:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4622491 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 98564C0338 for ; Fri, 25 Jul 2014 11:35:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0DC62010F for ; Fri, 25 Jul 2014 11:35:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22F01201ED for ; Fri, 25 Jul 2014 11:35:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760264AbaGYLes (ORCPT ); Fri, 25 Jul 2014 07:34:48 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:60096 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751856AbaGYLer (ORCPT ); Fri, 25 Jul 2014 07:34:47 -0400 Received: by mail-qa0-f46.google.com with SMTP id v10so4374593qac.5 for ; Fri, 25 Jul 2014 04:34:47 -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=ZRRNAaofhh9cL3c1AUCicDvmEMUeWyFsGqo0j4C/BaM=; b=YO+PoHcdVpB852YvvScHAwwWd1bG/CqSGbFhgHPNSe2UrJFRX2UIit8bNB1ZYI+ohs rVcI3Mq57Z1YlBPKosU0FQe0sXMTb0jUe+FdZeV4EEoOD6ECGCHc0aFTqQhut5v34exT QP+sG1pMXM6uGYo79OZS7k2GLzTXKhTtZThy0BN2MpylYWdbZ8NdqqsuU0CbhdBgDSVI 0YN4QNyA05dGEe6jAFS0+2k/FnJtvkV0DK2Ldvxliay3wt+dDus5EcXFAIpDGNK7gdLY +RhIIAwBfvlm2XCaFQqM6zQDP3XKzNFlXGQHpGAuPluVLp6D9dFZGe72/TyjdDrctzqW giQQ== X-Gm-Message-State: ALoCoQkuPsV2XaqlVH3DHbLp7htkRrFbVoZpMBLZKYAGWXR6ZmJJ+yVpFTXfFtEKmvi+izI7l9oq X-Received: by 10.140.19.100 with SMTP id 91mr25561918qgg.32.1406288086681; Fri, 25 Jul 2014 04:34:46 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id p12sm11041561qga.0.2014.07.25.04.34.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jul 2014 04:34:45 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH v6 4/9] nfsd: Convert delegation counter to an atomic_long_t type Date: Fri, 25 Jul 2014 07:34:22 -0400 Message-Id: <1406288067-20663-5-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406288067-20663-1-git-send-email-jlayton@primarydata.com> References: <1406288067-20663-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, 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 Reviewed-by: Christoph Hellwig --- 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 9c912c004247..b421b51c3a9e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -342,7 +342,7 @@ find_any_file(struct nfs4_file *f) return ret; } -static int num_delegations; +static atomic_long_t num_delegations; unsigned long max_delegations; /* @@ -582,22 +582,23 @@ 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; /* * delegation seqid's are never incremented. The 4.1 special * meaning of seqid 0 isn't meaningful, really, but let's avoid * 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); @@ -605,6 +606,9 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall); return dp; +out_dec: + atomic_long_dec(&num_delegations); + return NULL; } static void remove_stid(struct nfs4_stid *s) @@ -627,7 +631,7 @@ nfs4_put_delegation(struct nfs4_delegation *dp) put_nfs4_file(dp->dl_file); remove_stid(&dp->dl_stid); nfs4_free_stid(deleg_slab, &dp->dl_stid); - num_delegations--; + atomic_long_dec(&num_delegations); } }