From patchwork Tue Nov 17 11:52:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7636141 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 05339BF90C for ; Tue, 17 Nov 2015 11:53:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 239AC204FC for ; Tue, 17 Nov 2015 11:53:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AF4B204EC for ; Tue, 17 Nov 2015 11:53:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753563AbbKQLxs (ORCPT ); Tue, 17 Nov 2015 06:53:48 -0500 Received: from mail-qg0-f52.google.com ([209.85.192.52]:36120 "EHLO mail-qg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753449AbbKQLxf (ORCPT ); Tue, 17 Nov 2015 06:53:35 -0500 Received: by qgad10 with SMTP id d10so3410340qga.3 for ; Tue, 17 Nov 2015 03:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M+XdXHVQdKt+pq2N2Iv1WynQg1J4g8iVT7AX0fyH1NA=; b=UWqBXUMV34qnS4iA29ItUn5u2FC8X2fQsQCz4QZLGapu+Uo9hG8BVQdKzVlJXeq0ZM cTGlfrLwRk0uDyhMCZ9M7d1mFtRL01DTdmpc2dAU4LB2snfbThcejDonhq6pfy0waDMY gG2iF8hkhiVQFSR6aWEcy77GoZsDrjn3BBeu0cqjSAuL5vp/NW5T4m10HbCmwh+Alz3d DyZYMT/y/7DX+sGz8VRXqjFf912a84vdCQ/N6vMX1dFbhHZzU7xTi5ezE6wKMZmdFqll oKZXhHpTMPg007QwRThXqsl0FvMVy5Izuhsr0Es+rQw0WnL2CQY86h4hWpygL/E3zFXu ytCA== 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=M+XdXHVQdKt+pq2N2Iv1WynQg1J4g8iVT7AX0fyH1NA=; b=JKaKdVpuzS6ekjVsb+3XhnRWD2LmG8pbiVlUHr/Xr9WlkASJSyfEaNgGIuuCKpWhxQ JA8CbTCdnR1cggKJUDOSjhgmB4kIl+ckI25K82IF+96FbId0FrnOJfQhdETCWL+Wl3Gm l/c3GYeataMNTH1PIhntddALnUCR07YeIqQw6xW+RbWkfqxz6OZ3U8nzKWTuDTaEfNCZ HzLlyZJ6mEKW9OHYikMi9uyMs91qOmWFvdNeFEScaFLvtxvFN416yjWwznqcgiWSfaP6 Azx0OXJNjc1iDOOf+NW5d7Lq9C15v/TMWJEc4MuJXviBBycxLdUdwrKfiykvBqEWykao 0ZaA== X-Gm-Message-State: ALoCoQlXuOLphuknIBii+sSHByAaaL4aEagAD8ov8TNUHKUKleOff8nOtc5HOGqXH0emuzsznlRC X-Received: by 10.140.109.247 with SMTP id l110mr12058405qgf.35.1447761215341; Tue, 17 Nov 2015 03:53:35 -0800 (PST) Received: from tlielax.poochiereds.net ([2606:a000:1125:4075::d5a]) by smtp.googlemail.com with ESMTPSA id w10sm1583910qhc.16.2015.11.17.03.53.34 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Nov 2015 03:53:34 -0800 (PST) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org, trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Eric Paris , Alexander Viro , linux-fsdevel@vger.kernel.org Subject: [PATCH v1 17/38] nfsd: hook nfsd_commit up to the nfsd_file cache Date: Tue, 17 Nov 2015 06:52:39 -0500 Message-Id: <1447761180-4250-18-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> References: <1447761180-4250-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=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Use cached filps if possible instead of opening a new one every time. Signed-off-by: Jeff Layton --- fs/nfsd/vfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 0873c1355bb1..62e6194d58f8 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1058,9 +1058,9 @@ __be32 nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset, unsigned long count) { - struct file *file; - loff_t end = LLONG_MAX; - __be32 err = nfserr_inval; + struct nfsd_file *nf; + loff_t end = LLONG_MAX; + __be32 err = nfserr_inval; if (offset < 0) goto out; @@ -1070,12 +1070,12 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, goto out; } - err = nfsd_open(rqstp, fhp, S_IFREG, - NFSD_MAY_WRITE|NFSD_MAY_NOT_BREAK_LEASE, &file); + err = nfsd_file_acquire(rqstp, fhp, + NFSD_MAY_WRITE|NFSD_MAY_NOT_BREAK_LEASE, &nf); if (err) goto out; if (EX_ISSYNC(fhp->fh_export)) { - int err2 = vfs_fsync_range(file, offset, end, 0); + int err2 = vfs_fsync_range(nf->nf_file, offset, end, 0); if (err2 != -EINVAL) err = nfserrno(err2); @@ -1083,7 +1083,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, err = nfserr_notsupp; } - fput(file); + nfsd_file_put(nf); out: return err; }