From patchwork Thu Jun 26 19:21:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4431361 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 E399C9F2C8 for ; Thu, 26 Jun 2014 19:22:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 063FF20251 for ; Thu, 26 Jun 2014 19:22:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F7C720260 for ; Thu, 26 Jun 2014 19:22:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751869AbaFZTWN (ORCPT ); Thu, 26 Jun 2014 15:22:13 -0400 Received: from mail-qc0-f171.google.com ([209.85.216.171]:53774 "EHLO mail-qc0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910AbaFZTWD (ORCPT ); Thu, 26 Jun 2014 15:22:03 -0400 Received: by mail-qc0-f171.google.com with SMTP id w7so3565302qcr.16 for ; Thu, 26 Jun 2014 12:22:03 -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=ZnunZq1iAOgIYfZRV/VshG/XgQsAGcaix/1Sqf2sabA=; b=kYutvJqoQP8KRuwr3rayawyk685+JZrlD0BzF2hl2pFrx/Xoc+GS7iyiB1uhs3RJbz 5TOuYFgiUruf0Kf1F91Ga6QoNMQjUjfl6z7GzJv1ybcWDSkYU2UuBIsGARhI6RPBNBiJ rGjI3ooXcOxZuhSXeXAZsmOWaD/hlIqsQ+uMQXL7QZ0nqp2OXiyNplxqWisjUzBOspAu ntbsFNLXeidRFftvSk72ByFIuC/eheeArzOFcx0gL4rnlFWtiraNqpm8uwZaq+hsElyB TDvepvAH+inQaxs7Y2+Vjhw8l+pq2lnJ9erLHVjHVuCvp/0qx09Gz7B9BSPKZlYiTK+V 2ucw== X-Gm-Message-State: ALoCoQm+/zGHGM+H5U8S9Aj1UXB+t7brfsO85HtHfqpyNNNnYWK5qMADgLUUS+EVHSKCUaZ0Ew81 X-Received: by 10.224.68.2 with SMTP id t2mr25850309qai.71.1403810523100; Thu, 26 Jun 2014 12:22:03 -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.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:22:02 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v2 108/117] nfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close Date: Thu, 26 Jun 2014 15:21:16 -0400 Message-Id: <1403810485-16497-25-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 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3d5ea785652b..2d67dd5268e8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4667,7 +4667,6 @@ put_stateid: put_generic_stateid(stp); out: nfsd4_bump_seqid(cstate, status); - nfs4_unlock_state(); return status; } @@ -4730,7 +4729,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) @@ -4796,7 +4794,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, @@ -4812,7 +4809,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; }