From patchwork Wed Jul 30 12:27:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4648241 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 441949F36A for ; Wed, 30 Jul 2014 12:28:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C2B820121 for ; Wed, 30 Jul 2014 12:28:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF24C20138 for ; Wed, 30 Jul 2014 12:28:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753773AbaG3M2e (ORCPT ); Wed, 30 Jul 2014 08:28:34 -0400 Received: from mail-qg0-f46.google.com ([209.85.192.46]:39086 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754001AbaG3M2a (ORCPT ); Wed, 30 Jul 2014 08:28:30 -0400 Received: by mail-qg0-f46.google.com with SMTP id z60so1274682qgd.33 for ; Wed, 30 Jul 2014 05:28:29 -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=DNO1w4iIjyKs1UcGYTzkleg00okUWwdFERT9QcHj3wE=; b=i5DdzrADXGSj0jfy6K6v3MGBzlkRzZY/BlLEUrcI3LhBwwYaqynr8k57QQctA3tDB3 gnV9h3CMl+WQfYVjq/FwdREDHNDpRpUNkRV2QMxR87NABKVPLFozwxx9uu9cm1e1OijZ IrS++vjFpXGQCNXWRnNlVH62VI9mCAMoU5jCv0u5rwvqk/C8+C7jDI4RquUjmXW8E7ET cmTg+QVM1Uslr1rDRiMKFkZqcJpzz3snANY+PbtIGS/l+bYx9YSl5zvCF8puhCf4ToxE tdZ37988FUp1gCVrvnDsaj8K//1iiBewqT7eb5RKWNvaSTT3334eN+NDECZtyqx+dsgz +4Hg== X-Gm-Message-State: ALoCoQnX/s5rt5f4oWIHWQN/6lXg3X/eXQxeFbPoC5pQKgzqw2eUo5rhlN6C2DM8J28J2hkDN70d X-Received: by 10.224.36.130 with SMTP id t2mr5533311qad.45.1406723309768; Wed, 30 Jul 2014 05:28:29 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id t23sm2384767qge.13.2014.07.30.05.28.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 05:28:28 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH 32/37] nfsd: Remove nfs4_lock_state(): setclientid, setclientid_confirm, renew Date: Wed, 30 Jul 2014 08:27:33 -0400 Message-Id: <1406723258-8512-33-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406723258-8512-1-git-send-email-jlayton@primarydata.com> References: <1406723258-8512-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 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 3b7fceed0a0a..a45dcd15b8f7 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2944,7 +2944,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) { @@ -2979,7 +2978,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) @@ -3002,7 +3000,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); @@ -3052,7 +3049,6 @@ out: spin_unlock(&nn->client_lock); if (old) expire_client(old); - nfs4_unlock_state(); return status; } @@ -4109,7 +4105,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); @@ -4122,7 +4117,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, goto out; status = nfs_ok; out: - nfs4_unlock_state(); return status; }