From patchwork Thu Jun 19 14:50:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384531 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 A57089F1D6 for ; Thu, 19 Jun 2014 14:53:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D614E20384 for ; Thu, 19 Jun 2014 14:53:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D895E2038F for ; Thu, 19 Jun 2014 14:53:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932782AbaFSOx0 (ORCPT ); Thu, 19 Jun 2014 10:53:26 -0400 Received: from mail-qg0-f44.google.com ([209.85.192.44]:61476 "EHLO mail-qg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932775AbaFSOxU (ORCPT ); Thu, 19 Jun 2014 10:53:20 -0400 Received: by mail-qg0-f44.google.com with SMTP id j107so2240717qga.31 for ; Thu, 19 Jun 2014 07:53:19 -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=sQ1V/vQ3Xn0NlqNLIM3UXxMKX1MloKFEhWyiYebgB8I=; b=KKd3enhim5J/F6MsqLNBrbelqnq6E8+voIHJd9w8btlHJ/N+21A1V+dXAysT0oLKUJ OmnYbA6q92nfaBj8V38AWATABEXjkn1LCNIZwKqn8NbbR4bLM4fkI+T15mkyMjBbgeoP L8qnWxX0QeoWzeXcrLlHrinATYZXG8QRtLfLHM+DyfQVjoJ0aBJuaKr2WHkTYIaiQ6Zx 3EGdwYdwwXzHS9hDzRrAPUPmHVupLkkSxkGy7I6pE4k4hKWyxO5XUiikTVPKPIfi3Uh/ vG8r1frNXtsnAnfs5pCycx4uSgguKN09uzgjkU6FozxAUtvX7IqHtERtrJp9CiAZ9NSk /Vww== X-Gm-Message-State: ALoCoQlvjcFjrPPA7XsZ8LgEnbc1UaqRYgDFlH4Mgsup02muVpbDaf8Q8NgG9l+d5EsAbcg2WmHe X-Received: by 10.140.89.18 with SMTP id u18mr7404161qgd.90.1403189599470; Thu, 19 Jun 2014 07:53:19 -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.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:18 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 099/104] NFSd: Remove nfs4_lock_state(): setclientid, setclientid_confirm, renew Date: Thu, 19 Jun 2014 10:50:45 -0400 Message-Id: <1403189450-18729-100-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 From: Trond Myklebust Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index d91247f86d6b..e159e316ecdb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2783,7 +2783,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (new == NULL) return nfserr_jukebox; /* Cases below refer to rfc 3530 section 14.2.33: */ - nfs4_lock_state(); spin_lock(&nn->client_lock); conf = find_confirmed_client_by_name(&clname, nn); if (conf) { @@ -2818,7 +2817,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfs_ok; out: spin_unlock(&nn->client_lock); - nfs4_unlock_state(); if (new) free_client(new); if (unconf) @@ -2841,7 +2839,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, if (STALE_CLIENTID(clid, nn)) return nfserr_stale_clientid; - nfs4_lock_state(); spin_lock(&nn->client_lock); conf = find_confirmed_client(clid, false, nn); @@ -2891,7 +2888,6 @@ out: spin_unlock(&nn->client_lock); if (old) expire_client(old); - nfs4_unlock_state(); return status; } @@ -3948,7 +3944,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, __be32 status; struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); - nfs4_lock_state(); dprintk("process_renew(%08x/%08x): starting\n", clid->cl_boot, clid->cl_id); status = lookup_clientid(clid, cstate, nn); @@ -3961,7 +3956,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, goto out; status = nfs_ok; out: - nfs4_unlock_state(); return status; }