From patchwork Thu Jun 19 14:50:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384511 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 C56FB9F1D6 for ; Thu, 19 Jun 2014 14:53:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D423E20384 for ; Thu, 19 Jun 2014 14:53:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFD702038F for ; Thu, 19 Jun 2014 14:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932710AbaFSOxW (ORCPT ); Thu, 19 Jun 2014 10:53:22 -0400 Received: from mail-qa0-f45.google.com ([209.85.216.45]:63983 "EHLO mail-qa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932778AbaFSOxV (ORCPT ); Thu, 19 Jun 2014 10:53:21 -0400 Received: by mail-qa0-f45.google.com with SMTP id v10so2000994qac.4 for ; Thu, 19 Jun 2014 07:53: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=Q3P+SYR683VTFLlkLYMeY1hGwjAWeq6gDJAhDn6ez34=; b=jkkKj/tigQAeXljeSkOt+4NE2FaASikaNlizzNZkKrd/DPX0R1xc0yide7snRYXW9D 8oJulAAXpZhPn9tIL9wERLwjHZPYLd+YtjLqqQ/t+x3NnvPqxtusICP6+dQk1bpGdfxP +XhLAE9AlUSm/e/1dryPlgWyLVZ2Df5Qx8LKyvWEcipkMhuETbCLmPWfmKrGB5es8j3Z BCFHQQqYAc71CzICvv78BBs30oNHt3V8RuCW+x9Fwmpw0zcMWYjInAoetdsc2FRUMgMK NuIJUvFzd+jWOXIsWUfgoZI1wyCXZSnG9L6b9zxFYgMUijjlNjJYP5dNVXS0NGsKS0Vg EHHw== X-Gm-Message-State: ALoCoQm3HWR2YYJaIub49bNswnJo22pHwGsAe9Otv3aYFBI0XSMPOj3bA3CfvsIMHth/H6z8CWXa X-Received: by 10.140.28.198 with SMTP id 64mr6817583qgz.49.1403189600806; Thu, 19 Jun 2014 07:53:20 -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.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:20 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 100/104] NFSd: Remove nfs4_lock_state(): reclaim_complete() Date: Thu, 19 Jun 2014 10:50:46 -0400 Message-Id: <1403189450-18729-101-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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e159e316ecdb..6000da3285d7 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2744,7 +2744,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)) @@ -2764,7 +2763,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; }