From patchwork Wed Jul 30 12:27:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4648211 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 860B79F36A for ; Wed, 30 Jul 2014 12:28:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4D312017A for ; Wed, 30 Jul 2014 12:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E985020138 for ; Wed, 30 Jul 2014 12:28:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753438AbaG3M2e (ORCPT ); Wed, 30 Jul 2014 08:28:34 -0400 Received: from mail-qg0-f41.google.com ([209.85.192.41]:57335 "EHLO mail-qg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745AbaG3M2c (ORCPT ); Wed, 30 Jul 2014 08:28:32 -0400 Received: by mail-qg0-f41.google.com with SMTP id q107so1290986qgd.0 for ; Wed, 30 Jul 2014 05:28:31 -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=NRHfHoyd1dSjipsQPJahGCyRhGA4kv3ufGgIHfwZxYE=; b=ju3Dfr6EItGOYoADouaZNFhJ4/JoOtWEVdgeaCnlrheNvhrBYfClyIv9FPQJtVmGkD B6ps+EUahvihhOhR1ySoLQfikQt0ip5pXUJQTS0tNlAelgpdH2T97Md59FxYQEvQqAo1 J7Q0AFCmBMLh60IbA+Zil+601QF6IAU5HH54LDihdjJ5MewcOD4mRAo3whcNbn7Yl1z/ C0qqWDrYZKQs3wuzL2fTY7MkTjvRWoNoW/zSAue/DHpqvaD49O401C7RO2OWdfvrxVv6 oP8eXIeZRhuPj0gpQroMvAVIVOwfGlr9CZsFXETD4kxhHKi5qDNNv9bHNWAEbL4H0Pxa Z2hA== X-Gm-Message-State: ALoCoQk6tzNW0GgLqz5v6zuEnMrqPORWlWUIUQCn43QH+2Sfi3H+tGmTs6jvqPuUP1/I/1qA70gD X-Received: by 10.229.39.73 with SMTP id f9mr6249476qce.27.1406723311281; Wed, 30 Jul 2014 05:28:31 -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.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 05:28:30 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH 33/37] nfsd: Remove nfs4_lock_state(): reclaim_complete() Date: Wed, 30 Jul 2014 08:27:34 -0400 Message-Id: <1406723258-8512-34-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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a45dcd15b8f7..d98d33d0e304 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2905,7 +2905,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)) @@ -2925,7 +2924,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; }