From patchwork Thu Jun 19 14:50:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384561 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 3FA52BEECB for ; Thu, 19 Jun 2014 14:53:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8138320394 for ; Thu, 19 Jun 2014 14:53:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA9EE20384 for ; Thu, 19 Jun 2014 14:53:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932794AbaFSOx1 (ORCPT ); Thu, 19 Jun 2014 10:53:27 -0400 Received: from mail-qg0-f48.google.com ([209.85.192.48]:65294 "EHLO mail-qg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932778AbaFSOxZ (ORCPT ); Thu, 19 Jun 2014 10:53:25 -0400 Received: by mail-qg0-f48.google.com with SMTP id q108so2209158qgd.35 for ; Thu, 19 Jun 2014 07:53:25 -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=73PvH0w35XFNcxhnbBYPhOJSw3AdfGp27E6bBkBy7kA=; b=LKlu6vvR7yrSusKW72K+0F1cgGEofO+ZGY6YORx8yeOnZkpGQ3xeh5SxiKXPkjim8+ OzB5rYV4+ux6nRB6qFEFfUYPTB21iDXSmDMhaHb74hlxvbUuW7TlYINic1GrjiTCVrru 1uEGuQvUXyC33g7poiEczQ7p8Tsn+ULCvfekSSW2mrDv4LNjkyIgvJ4lK2rShzaCDc+e y818CmpR3dDIl0pgf2RV7iJ/RxkyflSy2mnVPDkRJAcuLhrqED3E81Msiv0f6jRdDmB8 4iAo5fohCleU4N3ARQiW9LBNQRbtiDqKtjzR/RFyKpoXS7/s1Navfaa0+4GSPcc94vu0 PM3Q== X-Gm-Message-State: ALoCoQljbaCurkFwQtHzy1MSoV41VedR0Ch+esAhTTFBTv5+jIRHc7DkKm110B+t5rj6DwUup46p X-Received: by 10.140.84.18 with SMTP id k18mr7451816qgd.70.1403189604983; Thu, 19 Jun 2014 07:53:24 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-107-015-124-230.nc.res.rr.com. [107.15.124.230]) by mx.google.com with ESMTPSA id r60sm3364044qgd.26.2014.06.19.07.53.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:24 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 103/104] nfsd: remove the client_mutex and the nfs4_lock/unlock_state wrappers Date: Thu, 19 Jun 2014 10:50:49 -0400 Message-Id: <1403189450-18729-104-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> References: <1403189450-18729-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 Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a37e9d2aa047..e3df298b7aee 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -82,9 +82,6 @@ static __be32 lookup_clientid(clientid_t *clid, /* Locking: */ -/* Currently used for almost all code touching nfsv4 state: */ -static DEFINE_MUTEX(client_mutex); - /* * Currently used for the del_recall_lru and file hash table. In an * effort to decrease the scope of the client_mutex, this spinlock may @@ -104,12 +101,6 @@ static struct kmem_cache *file_slab; static struct kmem_cache *stateid_slab; static struct kmem_cache *deleg_slab; -void -nfs4_lock_state(void) -{ - mutex_lock(&client_mutex); -} - static void free_session(struct nfsd4_session *); static bool is_session_dead(struct nfsd4_session *ses) @@ -125,12 +116,6 @@ static __be32 mark_session_dead_locked(struct nfsd4_session *ses, int ref_held_b return nfs_ok; } -void -nfs4_unlock_state(void) -{ - mutex_unlock(&client_mutex); -} - static bool is_client_expired(struct nfs4_client *clp) { return clp->cl_time == 0;