From patchwork Wed Jul 30 01:34:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4644291 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 4A2909F36A for ; Wed, 30 Jul 2014 01:35:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B8D720142 for ; Wed, 30 Jul 2014 01:35:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 941A72012B for ; Wed, 30 Jul 2014 01:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754739AbaG3Bfl (ORCPT ); Tue, 29 Jul 2014 21:35:41 -0400 Received: from mail-qg0-f43.google.com ([209.85.192.43]:48767 "EHLO mail-qg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754656AbaG3Bfk (ORCPT ); Tue, 29 Jul 2014 21:35:40 -0400 Received: by mail-qg0-f43.google.com with SMTP id a108so668517qge.30 for ; Tue, 29 Jul 2014 18:35:39 -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=SZmsmIkZijGsZge7sqXdIpXly3zc9TTB20nvO+kXpNo=; b=IpNnTxn9lO2vjQpiKianBFUwvX/hk427bNyB1+vJ5n10CUwMoECH8a/n9HlCplpQmg h88L1T9kNYJ5fn8rvWzXa9eSq4kIQV9zFdj3B1ofMvcMrzKdsVKzyH3Er+XtxaFxhyBI wetaNqj3CRgZyPxVhg6rpw6VzqjD6AhHfOt71DS+m8jN5SSoDiphJ3bBB9jShBm2QHyd MjKmM9O+7GRHUqBwfRykw2t1zDuh90A/92SmWw6zmVZWUwaugYbLMTutU9+YWFmI5QfH NGeLLdKemD+Hk57bFCBIOuZMXMzDKokFmlFWcQWYJAZ/el01/962FXatW6w63rwBcrYd vbcA== X-Gm-Message-State: ALoCoQkxIkJcS/eL2tYHPWZPylXd/OYharnFjzfW+TpVCtexUdKVHxL01i139TANtbPEWh6vqNkA X-Received: by 10.140.23.198 with SMTP id 64mr1193775qgp.84.1406684139748; Tue, 29 Jul 2014 18:35:39 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id 81sm860946qgw.21.2014.07.29.18.35.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jul 2014 18:35:38 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org Subject: [PATCH v3 33/38] nfsd: add locking to stateowner release Date: Tue, 29 Jul 2014 21:34:38 -0400 Message-Id: <1406684083-19736-34-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406684083-19736-1-git-send-email-jlayton@primarydata.com> References: <1406684083-19736-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=-7.6 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 Once we remove the client_mutex, we'll need to properly protect the stateowner reference counts using the cl_lock. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index cd7d7df03afa..9b342e164407 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -937,9 +937,14 @@ release_all_access(struct nfs4_ol_stateid *stp) static void nfs4_put_stateowner(struct nfs4_stateowner *sop) { - if (!atomic_dec_and_test(&sop->so_count)) + struct nfs4_client *clp = sop->so_client; + + might_lock(&clp->cl_lock); + + if (!atomic_dec_and_lock(&sop->so_count, &clp->cl_lock)) return; sop->so_ops->so_unhash(sop); + spin_unlock(&clp->cl_lock); kfree(sop->so_owner.data); sop->so_ops->so_free(sop); } @@ -3078,11 +3083,7 @@ static void hash_openowner(struct nfs4_openowner *oo, struct nfs4_client *clp, u static void nfs4_unhash_openowner(struct nfs4_stateowner *so) { - struct nfs4_client *clp = so->so_client; - - spin_lock(&clp->cl_lock); unhash_openowner_locked(openowner(so)); - spin_unlock(&clp->cl_lock); } static void nfs4_free_openowner(struct nfs4_stateowner *so) @@ -4842,11 +4843,7 @@ find_lockowner_str(clientid_t *clid, struct xdr_netobj *owner, static void nfs4_unhash_lockowner(struct nfs4_stateowner *sop) { - struct nfs4_client *clp = sop->so_client; - - spin_lock(&clp->cl_lock); unhash_lockowner_locked(lockowner(sop)); - spin_unlock(&clp->cl_lock); } static void nfs4_free_lockowner(struct nfs4_stateowner *sop)