From patchwork Thu Jun 19 14:50: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: 4384451 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 B07239F1D6 for ; Thu, 19 Jun 2014 14:53:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BBC5F20384 for ; Thu, 19 Jun 2014 14:53:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D80820395 for ; Thu, 19 Jun 2014 14:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932295AbaFSOxN (ORCPT ); Thu, 19 Jun 2014 10:53:13 -0400 Received: from mail-qc0-f178.google.com ([209.85.216.178]:33709 "EHLO mail-qc0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932579AbaFSOxJ (ORCPT ); Thu, 19 Jun 2014 10:53:09 -0400 Received: by mail-qc0-f178.google.com with SMTP id c9so2247674qcz.37 for ; Thu, 19 Jun 2014 07:53:09 -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=dObipoc6oiU2vVm+AyfBzYdsCM+qMkr1g1RJP8NJucs=; b=h+yfDiaovkmBP5XZajQtunC9yn63NWH5fLeQZ1EwANgCgQgWbOdbinxd0rN7dsmQMn cTw17N0b7j/RS6TDT90pVUAcjFJlF88Z+Lke+n4YdMf629b8MSFn8+5MtInDOslwEhfX 5wDUxZwETlndbsgEVDc0ZQNXtT2gR76kbLFXagecpq2djXDp7ANXP5HVYi14saSNjQPU L4zCsvk4IKmsf4aVlDYLZ4k7y7izAzhMaIXNf5hSXLb5xyXB1YQhHE4741nza+80+IFJ IeXJTZItjAlwUtTdUzkzCBL7+YW280ufJosOETJLhF9z77y2jHJWFnHdqSvVfYzDOwX7 L9Ag== X-Gm-Message-State: ALoCoQnjNH1I2Han4EiFxNJej4yIu09PfByEvcI7yWkYtZopGk+2XmuK0cfkWlQGV9CZB/HhwbHw X-Received: by 10.224.43.211 with SMTP id x19mr7697793qae.17.1403189589147; Thu, 19 Jun 2014 07:53:09 -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.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:08 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 092/104] NFSd: Remove nfs4_lock_state(): nfsd4_test_stateid/nfsd4_free_stateid Date: Thu, 19 Jun 2014 10:50:38 -0400 Message-Id: <1403189450-18729-93-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 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c585730071a0..6aba06ec5dfc 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4370,11 +4370,9 @@ nfsd4_test_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_test_stateid_id *stateid; struct nfs4_client *cl = cstate->session->se_client; - nfs4_lock_state(); list_for_each_entry(stateid, &test_stateid->ts_stateid_list, ts_id_list) stateid->ts_id_status = nfsd4_validate_stateid(cl, &stateid->ts_id_stateid); - nfs4_unlock_state(); return nfs_ok; } @@ -4389,7 +4387,6 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfs4_client *cl = cstate->session->se_client; __be32 ret = nfserr_bad_stateid; - nfs4_lock_state(); s = find_stateid(cl, stateid); if (!s) goto out; @@ -4422,7 +4419,6 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, } nfs4_put_stid(s); out: - nfs4_unlock_state(); return ret; }