From patchwork Tue Oct 20 17:33:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7449401 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 41DD69F40A for ; Tue, 20 Oct 2015 17:34:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 822F920842 for ; Tue, 20 Oct 2015 17:34:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1C7020841 for ; Tue, 20 Oct 2015 17:34:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753024AbbJTRed (ORCPT ); Tue, 20 Oct 2015 13:34:33 -0400 Received: from mail-qg0-f50.google.com ([209.85.192.50]:35565 "EHLO mail-qg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753086AbbJTReN (ORCPT ); Tue, 20 Oct 2015 13:34:13 -0400 Received: by qgbb65 with SMTP id b65so21696534qgb.2 for ; Tue, 20 Oct 2015 10:34: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:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aW5bLwMeaBs9hgzxg5PCP0V8fLubRTO5ivzaOsO6mv8=; b=IChqd6AhZ0cW7GRpOu7XGkqFWtqBwGBvnTLNR54TmI0rKDA+yxF5Up36biHSWfi91W FX8g5BaksJ/3x0bEaPNQew2rKwnjG+sWiBRleDjliUMKqglLt4ENgM505fVhW3t3gbNi zqUi8Wk7bcWAypn39YSUMDgHcrXQDFOjgwjH3rAoDh2xyR++mQFoHCWFCjTNa5lQVHSG 8mmulzmb+pp0kz8Ja0k97FfxYPpDIiQp/C/Qhpv8YIY4mIQCt9I+pjNKwx2Nzt7cv0pf JSr7QmweukOH2pSgUNrsjGRcfJDAsM68QYtdB28bQPlnpm59Z4Baoz29EtGMQ++OSVhb ntPA== X-Gm-Message-State: ALoCoQkb4JM7owYL3m0cm/sxeUehtKh7icXbHN+f3GCgomN6Qen34njIGoMn7cPw1MSyt0geqAgs X-Received: by 10.140.42.139 with SMTP id c11mr5485072qga.106.1445362453063; Tue, 20 Oct 2015 10:34:13 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:6079::d5a]) by smtp.googlemail.com with ESMTPSA id m26sm1640925qki.28.2015.10.20.10.34.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 10:34:12 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Al Viro Subject: [PATCH v6 16/19] nfsd: have nfsd_test_lock use the nfsd_file cache Date: Tue, 20 Oct 2015 13:33:49 -0400 Message-Id: <1445362432-18869-17-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1445362432-18869-1-git-send-email-jeff.layton@primarydata.com> References: <1445362432-18869-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 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 Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b72fa6816860..4348af408ccb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5596,11 +5596,11 @@ out: */ static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock) { - struct file *file; - __be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); + struct nfsd_file *nf; + __be32 err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf); if (!err) { - err = nfserrno(vfs_test_lock(file, lock)); - fput(file); + err = nfserrno(vfs_test_lock(nf->nf_file, lock)); + nfsd_file_put(nf); } return err; }