From patchwork Thu Jun 26 19:21:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4431291 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 46AEF9F2C8 for ; Thu, 26 Jun 2014 19:22:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82AA320251 for ; Thu, 26 Jun 2014 19:22:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE19820154 for ; Thu, 26 Jun 2014 19:22:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751570AbaFZTWI (ORCPT ); Thu, 26 Jun 2014 15:22:08 -0400 Received: from mail-qa0-f50.google.com ([209.85.216.50]:36671 "EHLO mail-qa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751916AbaFZTWF (ORCPT ); Thu, 26 Jun 2014 15:22:05 -0400 Received: by mail-qa0-f50.google.com with SMTP id m5so3151904qaj.23 for ; Thu, 26 Jun 2014 12:22:04 -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=5ZZYrDfCUTgt6qAivk40LwabyAHMZwuhzNVrRJiYhU8=; b=aB8O8vzo44k2pog0SXHJfG1jI2BIT5oijj7ImQkDAxkCeTIyzuwCPjU1d4Bah+qgQG MG3LEZerIyu8v5X/FDvMNIz9JfZNul9Byu2iYtYCSkhLCO3qApLwTiF4CMfQBU2BAvPo T5sZr273gv85QpfwDfRtmijzp4UBeAdmHtKzWMxxv75oEB53ic9wpQ3h7TfATyxHOPHx bi+4Iy2Cbq0EF3aS9sqR2oXmE3KgagLQoIeb3ZCjhb6QH4QYD4l7bR0bXSwgSFHd+hO8 9r8aMCPv3CQ7/jDqWYmN4YWL5Fr9HCcfQ5NedMlJ+P8j39fClZBq5pL66LXqY16uzHWd gvkQ== X-Gm-Message-State: ALoCoQlTD6kMG9DqAuVSZRL/WbgvoS1D5y0aAQ6jzc3k8/5gihfF2Hh1U21jWp+SVMKX7WbRGba/ X-Received: by 10.224.163.146 with SMTP id a18mr25976372qay.31.1403810524497; Thu, 26 Jun 2014 12:22:04 -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.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jun 2014 12:22:03 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, Trond Myklebust Subject: [PATCH v2 109/117] nfsd: Remove nfs4_lock_state(): nfsd4_delegreturn() Date: Thu, 26 Jun 2014 15:21:17 -0400 Message-Id: <1403810485-16497-26-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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 2d67dd5268e8..8734847f7e49 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4825,7 +4825,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; @@ -4838,8 +4837,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, put_stateid: nfs4_put_delegation(dp); out: - nfs4_unlock_state(); - return status; }