From patchwork Wed Jul 30 12:27:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4648181 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 1C20DC033A for ; Wed, 30 Jul 2014 12:28:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B04E20160 for ; Wed, 30 Jul 2014 12:28:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A4832015E for ; Wed, 30 Jul 2014 12:28:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753830AbaG3M23 (ORCPT ); Wed, 30 Jul 2014 08:28:29 -0400 Received: from mail-qg0-f43.google.com ([209.85.192.43]:35518 "EHLO mail-qg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754730AbaG3M20 (ORCPT ); Wed, 30 Jul 2014 08:28:26 -0400 Received: by mail-qg0-f43.google.com with SMTP id a108so1316258qge.30 for ; Wed, 30 Jul 2014 05:28:25 -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=/KIE7hX+kRYHpvYLEFrtwIpbP/t4fHZNP4/b6cXgcC4=; b=j6QRADZ7c5nD9fzyaftChulDA7GikEfhfyQd8OkzOn9L8Q+yN76QuGXbeKaqqdHVrf 9ilrKiIWgT8s00wJCR12ReEm1W1KB/VAtNki4Js84Ccj+89EvpK8sMzyI6GnPCdVBH9t 3AlMn0+zytIFyOV2GhipEE/B5GNAoy2pFtIPankrkUBE5D0GJF10wNh85ybmmqgwOKhB uDRfd+kX9lEecow11slvi+oarRCgIrZXt2oIDFblLWbm1hrsuoN4kX/vYxU3UAKGpAGf Cvq1dyoKdqhBZ/ukr6/3LH87rnV7gsBg/CQvdDK6W5UlP+RDg6xlSSAWeBTNLrchpMnZ LUUQ== X-Gm-Message-State: ALoCoQndLzF6dW9aS+z+vaj0+UlCDpejhtwPpK3MujmTNUivwdWrsFG0QY7JEZQEIr5l6Rg8yZDd X-Received: by 10.229.235.133 with SMTP id kg5mr6387091qcb.24.1406723305660; Wed, 30 Jul 2014 05:28:25 -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.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 05:28:24 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org, Trond Myklebust Subject: [PATCH 29/37] nfsd: Remove nfs4_lock_state(): nfsd4_delegreturn() Date: Wed, 30 Jul 2014 08:27:30 -0400 Message-Id: <1406723258-8512-30-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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index eba119a46add..ae261d0e62e1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4851,7 +4851,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0))) return status; - nfs4_lock_state(); status = nfsd4_lookup_stateid(cstate, stateid, NFS4_DELEG_STID, &s, nn); if (status) goto out; @@ -4864,8 +4863,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, put_stateid: nfs4_put_stid(&dp->dl_stid); out: - nfs4_unlock_state(); - return status; }