From patchwork Mon Jun 30 15:49:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4451431 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 EE58ABEEAA for ; Mon, 30 Jun 2014 15:51:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2073E201C0 for ; Mon, 30 Jun 2014 15:51:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EBEE2021F for ; Mon, 30 Jun 2014 15:51:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754652AbaF3PvY (ORCPT ); Mon, 30 Jun 2014 11:51:24 -0400 Received: from mail-qg0-f46.google.com ([209.85.192.46]:56683 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750897AbaF3PvY (ORCPT ); Mon, 30 Jun 2014 11:51:24 -0400 Received: by mail-qg0-f46.google.com with SMTP id q107so2116127qgd.5 for ; Mon, 30 Jun 2014 08:51:23 -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=YTek6QB9k1chhbO90gA49usN0wUXmI5AMfOXOa3zqOQ=; b=hCVM1WKSJI47ivtSMvfZAVGcdpcd5hZatjm8FuQg7U34pATSRK5ZkHMNEu69S8CCnr vqkJnQ2qYPRUmfRxZHdnfCKklf5g4U0kvNDdfKa90GPCNZTBk3WGyo/dFv3r++asvRK4 gDusLZhXk9BV6od0YTLKPJbwLcFwrEIZj1nLHEdAZOQ7raLYYalq0VYqpTsJnSAx5vMX +idIpLUg1+YdYG1ni9pWtsvP+iBaBAezP9PS9dTM91CjUAgeiVO/RcnVyFPg8v9jrP2G 9a0hRmjywLL6EJMhnfxXqXkA9MAezMJLgzJ67XeBl5iAUx8RkYFmrXAnBwzhLTzvqwdu ogFg== X-Gm-Message-State: ALoCoQnzUbqbZfFPogXkLpTUMdBOlyhUUoObaH9PKmG5n65S5kYAMD4L8wEgSepleZXqHxTPKXxz X-Received: by 10.140.86.139 with SMTP id p11mr37394616qgd.66.1404143483525; Mon, 30 Jun 2014 08:51:23 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id m1sm32584105qaz.27.2014.06.30.08.51.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jun 2014 08:51:22 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v3 036/114] nfsd: Add reference counting to the lock and open stateids Date: Mon, 30 Jun 2014 11:49:05 -0400 Message-Id: <1404143423-24381-37-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> References: <1404143423-24381-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 befeb322cb92..380abf2258b3 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -850,8 +850,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); @@ -869,7 +871,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) @@ -932,7 +934,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) @@ -953,7 +955,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; } } @@ -3758,7 +3760,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); } __be32 @@ -4407,9 +4409,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);