From patchwork Thu Jun 26 19:12:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4430521 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 8E3A69F2C8 for ; Thu, 26 Jun 2014 19:14:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4627202AE for ; Thu, 26 Jun 2014 19:14:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA3012024D for ; Thu, 26 Jun 2014 19:14:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751764AbaFZTOm (ORCPT ); Thu, 26 Jun 2014 15:14:42 -0400 Received: from mail-qa0-f45.google.com ([209.85.216.45]:62027 "EHLO mail-qa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751511AbaFZTOl (ORCPT ); Thu, 26 Jun 2014 15:14:41 -0400 Received: by mail-qa0-f45.google.com with SMTP id v10so3161863qac.18 for ; Thu, 26 Jun 2014 12:14:40 -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=m3JT4Okb6cVD3Wc1O+sZgsO3KUEWf27LEvWr+27nNog=; b=JiTp2/JewZE+S7yH0ITiBVRS0prZLZdP4eakhoWB8h89lFt4YQZOMhyJIIs4rHi69i 6SqUkLk27dQu5MrcIi1WZRQqcs/qi5qfObCFXz1VQj+TEM37QLkT3GCuFqByYD7UTQvi CilzuWvWjBDxlrER3YNFH2BZeMsVKUqr/pGVv3vDUsDKbbB0CJZGruvgqOhoRUbn1ENJ +OXhiGrlWfp5Uv3J2OMoVW1V7gMS6S0vQXlmpDGeatRkPU4jXTLBNjOMoQQU2IbStPwQ f8kF7cazSh4EJ2fsc1zdd68IFwtvF0o/D9SYmNji+exCZ7PvkgV6Gahe8cUQ8HiFYFUO gaWw== X-Gm-Message-State: ALoCoQm3TWxoGtfA8VjNNiqaz8b3E0OvZgLmytb0GxiunHHHwCXno4ZRdLj5HGFuwdRd13a+pkau X-Received: by 10.229.117.136 with SMTP id r8mr25219111qcq.17.1403810080793; Thu, 26 Jun 2014 12:14:40 -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.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:14:39 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v2 040/117] nfsd: Add reference counting to the lock and open stateids Date: Thu, 26 Jun 2014 15:12:20 -0400 Message-Id: <1403810017-16062-41-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 When we remove the client_mutex, we'll need to be able to ensure that these objects aren't destroyed while we're not holding locks. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 78b90880d291..cad93b38f20b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -872,8 +872,10 @@ static void close_generic_stateid(struct nfs4_ol_stateid *stp) release_all_access(stp); } -static void free_generic_stateid(struct nfs4_ol_stateid *stp) +static void put_generic_stateid(struct nfs4_ol_stateid *stp) { + if (!atomic_dec_and_test(&stp->st_stid.sc_count)) + return; remove_stid(&stp->st_stid); if (stp->st_file) put_nfs4_file(stp->st_file); @@ -891,7 +893,7 @@ static void __release_lock_stateid(struct nfs4_ol_stateid *stp) if (file) filp_close(file, (fl_owner_t)lockowner(stp->st_stateowner)); close_generic_stateid(stp); - free_generic_stateid(stp); + put_generic_stateid(stp); } static void unhash_lockowner(struct nfs4_lockowner *lo) @@ -954,7 +956,7 @@ static void unhash_open_stateid(struct nfs4_ol_stateid *stp) static void release_open_stateid(struct nfs4_ol_stateid *stp) { unhash_open_stateid(stp); - free_generic_stateid(stp); + put_generic_stateid(stp); } static void unhash_openowner(struct nfs4_openowner *oo) @@ -975,7 +977,7 @@ static void release_last_closed_stateid(struct nfs4_openowner *oo) struct nfs4_ol_stateid *s = oo->oo_last_closed_stid; if (s) { - free_generic_stateid(s); + put_generic_stateid(s); oo->oo_last_closed_stid = NULL; } } @@ -3742,7 +3744,7 @@ void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status) if (open->op_file) nfsd4_free_file(open->op_file); if (open->op_stp) - free_generic_stateid(open->op_stp); + put_generic_stateid(open->op_stp); } static __be32 lookup_clientid(clientid_t *clid, @@ -4435,9 +4437,9 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s) unhash_open_stateid(s); if (clp->cl_minorversion) { - free_generic_stateid(s); if (list_empty(&oo->oo_owner.so_stateids)) release_openowner(oo); + put_generic_stateid(s); } else { if (s->st_file) { put_nfs4_file(s->st_file);