From patchwork Thu Jun 26 19:21:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4431371 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 87B8EBEECB for ; Thu, 26 Jun 2014 19:22:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B142A202FF for ; Thu, 26 Jun 2014 19:22:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB1B22028D for ; Thu, 26 Jun 2014 19:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751929AbaFZTWM (ORCPT ); Thu, 26 Jun 2014 15:22:12 -0400 Received: from mail-qc0-f182.google.com ([209.85.216.182]:34268 "EHLO mail-qc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751912AbaFZTWK (ORCPT ); Thu, 26 Jun 2014 15:22:10 -0400 Received: by mail-qc0-f182.google.com with SMTP id m20so3615247qcx.13 for ; Thu, 26 Jun 2014 12:22: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=+oXQaef8sdMSOhCWvKAX73trqzZSB0VMz9F9MPi0CSs=; b=hEgX2bDOgt0FvWoWwrTkj2+7k9+225zG+IHrMiuSoLcDScYmFjtOEAxmfZzS+PXcKE 1Kt/eKA1Iq6wCXOzUsAX9tIBxurZVfOJuACUOIzyJ2VcaADb7XwL/ToU9YdOBcLLaS0u 3/13nxrGFhrJh8KKkEApveBn+cZGzpW08Zipk8CdALigs6HZLaPTiazBTdWTfVbwCnjY hBv9L+4bltNu3+G5Uc0ylHusSpo2qke3LjRycsk7hf1nxmG4EzJxh1ae14fvAeIUAdmb rn+YZqhPzX6Uh8FPAjfd0h66hGMDKG+J7HzxkeQ7ogh40ntlMJpZj7AsFhTNfHrTKPra L+RQ== X-Gm-Message-State: ALoCoQmpOrXpGJyn89V0DzDf4kaJg7bUEwwAVEp6D/LhvAg1RTBV/NbK1epnpKP4lmFixBY10D/8 X-Received: by 10.224.93.2 with SMTP id t2mr20631860qam.41.1403810529756; Thu, 26 Jun 2014 12:22:09 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id k76sm4765555qgd.38.2014.06.26.12.22.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:22:08 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v2 113/117] nfsd: Remove nfs4_lock_state(): reclaim_complete() Date: Thu, 26 Jun 2014 15:21:21 -0400 Message-Id: <1403810485-16497-30-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403810017-16062-1-git-send-email-jlayton@primarydata.com> References: <1403810017-16062-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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9d963037eaa2..ccf6bb390fbb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2856,7 +2856,6 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta return nfs_ok; } - nfs4_lock_state(); status = nfserr_complete_already; if (test_and_set_bit(NFSD4_CLIENT_RECLAIM_COMPLETE, &cstate->session->se_client->cl_flags)) @@ -2876,7 +2875,6 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta status = nfs_ok; nfsd4_client_record_create(cstate->session->se_client); out: - nfs4_unlock_state(); return status; }