From patchwork Thu Jun 19 14:50:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384571 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 1CF3B9F1D6 for ; Thu, 19 Jun 2014 14:53:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5AD2A20394 for ; Thu, 19 Jun 2014 14:53:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8120A2038F for ; Thu, 19 Jun 2014 14:53:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932716AbaFSOxM (ORCPT ); Thu, 19 Jun 2014 10:53:12 -0400 Received: from mail-qc0-f171.google.com ([209.85.216.171]:34290 "EHLO mail-qc0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932295AbaFSOxL (ORCPT ); Thu, 19 Jun 2014 10:53:11 -0400 Received: by mail-qc0-f171.google.com with SMTP id w7so2274996qcr.16 for ; Thu, 19 Jun 2014 07:53:10 -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=skVP7FPPYl3ocGa8621Q6HqTZ+nTeex6hoEqOoP79bg=; b=K1Yr9B7N9pRxGYACC4tqIPUA8b9jchqhUmqfBa8i41eFHWg8oTpp8F+D6CW5ucvI34 Ey3H2pdIB018uonEuJoHvOYzeyl9i7IRtS3oa9U4NKx7kiUxjGHVTuR3884y0fidQa0S iG1BGaFrFNLUeOyv2SlrLdrJFTfvcApPXVbimF/6WZaTWmmAhhy6jH8ZTurEn316oq33 62fuAXx2k9C7P+oZRckYBkyO9jIwSubh2d0deGAGlBXp3Mjba0BUQQJXaVSZ9tfDYmu1 HTo+EU6JMPK+FFO0q4giocCPOCTxbhN0FdR2I39VcaVmAsRZy12mkt2F9ytd2Ukqrv3i lKxA== X-Gm-Message-State: ALoCoQkAs37RsQlFXmX2f679VbceO/tNptMjK/+xkKysEQkPagLdEasYCA8RQbbMwfDjwDdLnNJ/ X-Received: by 10.224.53.202 with SMTP id n10mr7486090qag.73.1403189590700; Thu, 19 Jun 2014 07:53:10 -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.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:09 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 093/104] NFSd: Remove nfs4_lock_state(): nfsd4_release_lockowner Date: Thu, 19 Jun 2014 10:50:39 -0400 Message-Id: <1403189450-18729-94-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 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6aba06ec5dfc..254ae3e7f8b6 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5423,11 +5423,9 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n", clid->cl_boot, clid->cl_id); - nfs4_lock_state(); - status = lookup_clientid(clid, cstate, nn); if (status) - goto out; + return status; status = nfserr_locks_held; INIT_LIST_HEAD(&matches); @@ -5468,7 +5466,6 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, out: if (sop) nfs4_put_stateowner(sop); - nfs4_unlock_state(); return status; }