From patchwork Thu Jun 19 14:50:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384461 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 3BC01BEEAA for ; Thu, 19 Jun 2014 14:53:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69FD220396 for ; Thu, 19 Jun 2014 14:53:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 900CB20394 for ; Thu, 19 Jun 2014 14:53:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932756AbaFSOxP (ORCPT ); Thu, 19 Jun 2014 10:53:15 -0400 Received: from mail-qa0-f54.google.com ([209.85.216.54]:35233 "EHLO mail-qa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932579AbaFSOxN (ORCPT ); Thu, 19 Jun 2014 10:53:13 -0400 Received: by mail-qa0-f54.google.com with SMTP id v10so2059958qac.27 for ; Thu, 19 Jun 2014 07:53:13 -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=tTBMY4e1/GY9agJeK8NOXcgatX7acuBNVky1G4t2Wgo=; b=TIjRsLow2xBEycLTfatSauLRbkMXWTv2qOqPhFJ/jrDtsLlUc6jPqdi8QwcEceAfvG cT7qaGRVEPMwhKsBIHrShfuqjNc2dtYNufnFo6hO1Bnfc6eisG+oWiicYOoTxRYpZCzL PRnvYAYU6fUn9xnrVNs6DXuGfQAMrZFLfIWqcurjpmX9Ve5W6WUm1JQIx4fmBMyuX6FL 2dS6qIu29V2d6jb00oEtk0hFKTIBKnZD4vrMKZr6KDUgYlIzQLJ8e3W+qOaKCAFD3RUh gy768rgQiQjwa6wyXzL0uc8lwezYrw6dxrBm8tNxluYCaLqjERAXGbacsOZMNxm427Zz 1Z3Q== X-Gm-Message-State: ALoCoQlutRuUTKMAfMJ85dFdwZUka7YPBm3ENRuA3AtrKKa2eV2E8p+VF0ounSHRl/O0RMm9s68O X-Received: by 10.140.37.138 with SMTP id r10mr7271504qgr.61.1403189593298; Thu, 19 Jun 2014 07:53:13 -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.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:12 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 095/104] NFSd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close Date: Thu, 19 Jun 2014 10:50:41 -0400 Message-Id: <1403189450-18729-96-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 --- fs/nfsd/nfs4state.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ecb0623d33a6..48c01cdb152d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4626,7 +4626,6 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, dprintk("NFSD: %s: od_deleg_want=0x%x ignored\n", __func__, od->od_deleg_want); - nfs4_lock_state(); status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid, &od->od_stateid, &stp, nn); if (status) @@ -4653,7 +4652,6 @@ put_stateid: put_generic_stateid(stp); out: nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); return status; } @@ -4693,7 +4691,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, dprintk("NFSD: nfsd4_close on file %pd\n", cstate->current_fh.fh_dentry); - nfs4_lock_state(); status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid, &close->cl_stateid, NFS4_OPEN_STID|NFS4_CLOSED_STID, @@ -4709,7 +4706,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, /* put reference from nfs4_preprocess_seqid_op */ put_generic_stateid(stp); out: - nfs4_unlock_state(); return status; }