From patchwork Thu Jul 17 19:12:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4578341 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 2C42AC0514 for ; Thu, 17 Jul 2014 19:12:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5323D201BA for ; Thu, 17 Jul 2014 19:12:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49791201BB for ; Thu, 17 Jul 2014 19:12:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755090AbaGQTMs (ORCPT ); Thu, 17 Jul 2014 15:12:48 -0400 Received: from mail-qc0-f176.google.com ([209.85.216.176]:43544 "EHLO mail-qc0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754905AbaGQTMp (ORCPT ); Thu, 17 Jul 2014 15:12:45 -0400 Received: by mail-qc0-f176.google.com with SMTP id i17so2511549qcy.35 for ; Thu, 17 Jul 2014 12:12:44 -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=jukXd5FikpOK+/gwndCxOhFzJCRPEfBzNa36iB2M2Ls=; b=d+dSRrmVz7Tty3IQN9Ml5/B+Wpt0SB8bdLEuEyuqhWVWjmHd4w2Kcky5gkW+79fPTW RG5WTrcsM0szOKcyf9WX2Bpqv8qDY4MeANUeP9xwPGdNNSj8D7Tr2pSRZghwIzxv5JE+ RXa21YnHfuZHmla7BDkQ2cmVg5VLDvHk/Xq0Kq4XxqVOOTGXu+MZ+gaEp5HELRNSZjRP RnoArM44EKdBAYuk92Y6+TBq+sO1XQ5DlhuUaJrzMWiRsKDGPx9WsgEhu3k171VVg0cZ MUcT4fz4q1PSRImO+RbOmVDk+KtPAt9oIOKyuPb3U/Tcd5JW5TcuWRZPboSNR14x+Ec2 pz5Q== X-Gm-Message-State: ALoCoQnxyIJZRTPDLfItX/77cmUrsWJC5Fp5oAnKmZvsGLpDJZhjiXh4Q4szbtzT24i8UEa1W2Yq X-Received: by 10.140.101.86 with SMTP id t80mr58152063qge.91.1405624364457; Thu, 17 Jul 2014 12:12:44 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id 98sm3678250qgh.5.2014.07.17.12.12.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 12:12:43 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: hch@infradead.org, linux-nfs@vger.kernel.org Subject: [PATCH 2/6] nfsd: Move the delegation reference counter into the struct nfs4_stid Date: Thu, 17 Jul 2014 15:12:30 -0400 Message-Id: <1405624354-22388-3-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405624354-22388-1-git-send-email-jlayton@primarydata.com> References: <1405624354-22388-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 will want to add reference counting to the lock stateid and open stateids too in later patches. Signed-off-by: Trond Myklebust Reviewed-by: Christoph Hellwig --- fs/nfsd/nfs4state.c | 6 +++--- fs/nfsd/state.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9bc896720db3..d88a33fa8e8f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -472,6 +472,7 @@ kmem_cache *slab) stid->sc_stateid.si_opaque.so_clid = cl->cl_clientid; /* Will be incremented before return to client: */ stid->sc_stateid.si_generation = 0; + atomic_set(&stid->sc_count, 1); /* * It shouldn't be a problem to reuse an opaque stateid value. @@ -595,7 +596,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv dp->dl_type = NFS4_OPEN_DELEGATE_READ; fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); dp->dl_time = 0; - atomic_set(&dp->dl_count, 1); INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall); return dp; } @@ -615,7 +615,7 @@ static void nfs4_free_stid(struct kmem_cache *slab, struct nfs4_stid *s) void nfs4_put_delegation(struct nfs4_delegation *dp) { - if (atomic_dec_and_test(&dp->dl_count)) { + if (atomic_dec_and_test(&dp->dl_stid.sc_count)) { remove_stid(&dp->dl_stid); nfs4_free_stid(deleg_slab, &dp->dl_stid); num_delegations--; @@ -3120,7 +3120,7 @@ static void nfsd_break_one_deleg(struct nfs4_delegation *dp) * lock) we know the server hasn't removed the lease yet, we know * it's safe to take a reference. */ - atomic_inc(&dp->dl_count); + atomic_inc(&dp->dl_stid.sc_count); nfsd4_cb_recall(dp); } diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 996d61eeb357..e68a9ae30fd7 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -73,6 +73,7 @@ struct nfsd4_callback { }; struct nfs4_stid { + atomic_t sc_count; #define NFS4_OPEN_STID 1 #define NFS4_LOCK_STID 2 #define NFS4_DELEG_STID 4 @@ -91,7 +92,6 @@ struct nfs4_delegation { struct list_head dl_perfile; struct list_head dl_perclnt; struct list_head dl_recall_lru; /* delegation recalled */ - atomic_t dl_count; /* ref count */ struct nfs4_file *dl_file; u32 dl_type; time_t dl_time;