From patchwork Thu Jun 26 19:12:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4430381 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 6EB0B9F402 for ; Thu, 26 Jun 2014 19:14:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 900212028D for ; Thu, 26 Jun 2014 19:14:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9612E2024D for ; Thu, 26 Jun 2014 19:14:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751748AbaFZTOX (ORCPT ); Thu, 26 Jun 2014 15:14:23 -0400 Received: from mail-qg0-f44.google.com ([209.85.192.44]:54918 "EHLO mail-qg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751744AbaFZTOW (ORCPT ); Thu, 26 Jun 2014 15:14:22 -0400 Received: by mail-qg0-f44.google.com with SMTP id j107so3500337qga.31 for ; Thu, 26 Jun 2014 12:14:21 -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=h9KPSOPDaB4/8XXlMar6CK8MjTdtJSV8fd93Lgn54WA=; b=nNmidDMWzhnEnU45+2trflza8/CWGKbaiJpF8whAhDHugChwNf48aqnyD/Y7ABFgdE qsAek9ZEt2f9FVhChxkQGy9CXuxKqstLasGzl8fKEirTXsWO8NhJpyShuJYCm9TC3mrN VozVW/QNwNz0fLPmQuwnBcjIWuimFRgteyZuhnvEhKtcc371dCmQNMSO6yatS52Esh6b GkYslFqrGK5FyN+wrEqQeR3TVk133FDkO5u79yGtfcEvIonF+PV5jFdLoOQn1P0kwwNy R+AxD7vCyL1n85rIVcOpTXwlnSESEDkfW5OxmKjEhVjoN0MYVCp7onKGuM+lSBoos1lb CEDw== X-Gm-Message-State: ALoCoQmF7043hRWAF/sOouyJyi35ZrRkS9Ov+I09Lz1j/Sw6kkz70XoNBaDppo6Wvsaj+P5OdKTk X-Received: by 10.224.40.194 with SMTP id l2mr26226657qae.81.1403810061605; Thu, 26 Jun 2014 12:14:21 -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.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:14:20 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v2 026/117] nfsd: Move the delegation reference counter into the struct nfs4_stid Date: Thu, 26 Jun 2014 15:12:06 -0400 Message-Id: <1403810017-16062-27-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 will want to add reference counting to the lock stateid and open stateids too in later patches. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 13 +++++++------ fs/nfsd/state.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a4636aac165e..4cb64d12c9bf 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -363,6 +363,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. @@ -484,7 +485,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); return dp; } @@ -503,7 +503,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)) { nfs4_free_stid(deleg_slab, &dp->dl_stid); num_delegations--; } @@ -2951,10 +2951,11 @@ static void nfsd_break_one_deleg(struct nfs4_delegation *dp) { /* We're assuming the state code never drops its reference * without first removing the lease. Since we're in this lease - * callback (and since the lease code is serialized by the kernel - * 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); + * callback (and since the lease code is serialized by the i_lock + * we know the server hasn't removed the lease yet, we know it's + * safe to take a reference. + */ + atomic_inc(&dp->dl_stid.sc_count); block_delegations(&dp->dl_fh); nfsd4_cb_recall(dp); } diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index b2c9afce33bf..9eb4fe673014 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 @@ -90,7 +91,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;