From patchwork Wed Jul 30 12:27:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4648151 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 91F55C0338 for ; Wed, 30 Jul 2014 12:28:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C59FE200E9 for ; Wed, 30 Jul 2014 12:28:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1BF620121 for ; Wed, 30 Jul 2014 12:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753876AbaG3M2V (ORCPT ); Wed, 30 Jul 2014 08:28:21 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:57535 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753830AbaG3M2U (ORCPT ); Wed, 30 Jul 2014 08:28:20 -0400 Received: by mail-qa0-f46.google.com with SMTP id v10so1175458qac.33 for ; Wed, 30 Jul 2014 05:28:20 -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=kn+fgc656bF+mfBaW/10jeGK9NWjJuBjVLIK1dPPCyM=; b=mtzGMbO4o3MZvJIOqPqZstzJI2KhxoVIz3+GWzxP+1XBo8kp7RaSUa5v3zchOez+zA wH/UzBGCAz1dhEXy6pUaEfP9K2qIset1uetyp2aAPUs5CJez8XKuR0aKNyF4TIcAvXdP RZeXOaIQ+VGgH4SBAXfEC+sbliuLWZUgHlWpqogWIbJ2S+F/3/HsAm7OStagWKjuq8/p U3wQi9GDScMy468TT7+9U6Gfy+MuUgxRQz26pOY/uZSvdM/zJeCJFuVI/nhDH8M9PuDf dIFfulK5foX/roPrZZKBpnS6MU7pf63qnhzg8aqdyjhkhdwQ6HmSMLbhYLfXqpf4byCj +ggg== X-Gm-Message-State: ALoCoQmR/Y/ZDC0yGXz53MWfDNwXfnMTlCOM/Wk9j9zemlZKC12f3FV8LXqGPbRhKC1Obmg0R4Tc X-Received: by 10.229.137.131 with SMTP id w3mr6266670qct.23.1406723300005; Wed, 30 Jul 2014 05:28:20 -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.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 05:28:19 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH 25/37] nfsd: Remove nfs4_lock_state(): nfsd4_test_stateid/nfsd4_free_stateid Date: Wed, 30 Jul 2014 08:27:26 -0400 Message-Id: <1406723258-8512-26-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 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9013a30874e3..cd9da9891039 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4528,11 +4528,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; } @@ -4548,7 +4546,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(); spin_lock(&cl->cl_lock); s = find_stateid_locked(cl, stateid); if (!s) @@ -4589,7 +4586,6 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, out_unlock: spin_unlock(&cl->cl_lock); out: - nfs4_unlock_state(); return ret; }