Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1627291pxb; Fri, 20 Nov 2020 14:41:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEXwwH2dhsXkhnOTE4H0+UKgb3zZTgz4tc2AlUOlAqTPCwo/lBMx0DdqZ5ZiY3NowAauyD X-Received: by 2002:a17:906:a4b:: with SMTP id x11mr35925873ejf.11.1605912087017; Fri, 20 Nov 2020 14:41:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605912087; cv=none; d=google.com; s=arc-20160816; b=0Jl/TPKKoOpNazcwpR5ClcZIaec8V8nxesCeu8avhH3ESxgq68UT43kVQeQfqb5yD3 ktghq6bdQmBaMlibpQ4aa/wXpCKHVMCKcoWBj/+xGkCKMig859ZWAAYyPnlBEdQn55yH 83Qd7lh+eCQcIZvDJmberb+INmzX6ZV/BIn2oflVn9PCl3vnMkieSvG8OBqEQzp+tRy4 oxHDjSDp3PjEikxQXBEtBQSKUmSIb0ELO048+mDYZqFZGB1edrr2ng5YlaC/tb9Gu07m 8tkqCiJsPY1MlzM6XJI9jX8SIaY/CER1QlDqVKYhfuTeoZxkhCSHGtUun5NiSiTwFe+f wzOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-filter; bh=pRMB+PKfIP8QMbHeddxmLIDD7P8UGoAdUGFikKbTWUg=; b=Fw/ji7h1Z47ly04dRte5Mo+W6chOlyV6Oxf2ROjIlAyPrGxf08AcCho0UKuY9RXzl2 mwO5q6CEqGpgzz0cVXQcaxgK8C/1OtxUZcIzlBDuXA77XoOoCvwEINPjQFvCE6virOuV zlJUwbpOGvzpXmQsw7gLPedHBM78Jq5DdApHiTag6fbpZYyHW5XNz74TXDr4zewGnnb6 Gmv9CaNmFFYXPPubfLdE/yB6YTAE2HtQ5PVA/ASQps6uKcRZBJEITCjvE8mfFa5cNMaB T8tcRcnOv+ybC/sRnms2Cph+vcVgmZ0TsxkiZWNd4zEmdkvC9NCZipenW6G7WCK4BI9y zrTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w1si2669603edu.459.2020.11.20.14.41.04; Fri, 20 Nov 2020 14:41:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726640AbgKTWjX (ORCPT + 99 others); Fri, 20 Nov 2020 17:39:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728888AbgKTWjX (ORCPT ); Fri, 20 Nov 2020 17:39:23 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC36CC061A48 for ; Fri, 20 Nov 2020 14:39:22 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 2422E6E9C; Fri, 20 Nov 2020 17:39:22 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 2422E6E9C From: "J. Bruce Fields" To: Jeff Layton Cc: Daire Byrne , Trond Myklebust , linux-cachefs , linux-nfs , "J. Bruce Fields" Subject: [PATCH 7/8] nfsd: skip some unnecessary stats in the v4 case Date: Fri, 20 Nov 2020 17:39:19 -0500 Message-Id: <1605911960-12516-7-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1605911960-12516-1-git-send-email-bfields@redhat.com> References: <20201120223831.GB7705@fieldses.org> <1605911960-12516-1-git-send-email-bfields@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" In the typical case of v4 and a i_version-supporting filesystem, we can skip a stat which is only required to fake up a change attribute from ctime. Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs3xdr.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 2732b04d3878..8502a493be6d 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -265,19 +265,21 @@ void fill_pre_wcc(struct svc_fh *fhp) if (fhp->fh_pre_saved) return; inode = d_inode(fhp->fh_dentry); - err = fh_getattr(fhp, &stat); - if (err) { - /* Grab the times from inode anyway */ - stat.mtime = inode->i_mtime; - stat.ctime = inode->i_ctime; - stat.size = inode->i_size; + if (!v4 || !inode->i_sb->s_export_op->fetch_iversion) { + err = fh_getattr(fhp, &stat); + if (err) { + /* Grab the times from inode anyway */ + stat.mtime = inode->i_mtime; + stat.ctime = inode->i_ctime; + stat.size = inode->i_size; + } + fhp->fh_pre_mtime = stat.mtime; + fhp->fh_pre_ctime = stat.ctime; + fhp->fh_pre_size = stat.size; } if (v4) fhp->fh_pre_change = nfsd4_change_attribute(&stat, inode); - fhp->fh_pre_mtime = stat.mtime; - fhp->fh_pre_ctime = stat.ctime; - fhp->fh_pre_size = stat.size; fhp->fh_pre_saved = true; } @@ -293,7 +295,9 @@ void fill_post_wcc(struct svc_fh *fhp) if (fhp->fh_post_saved) printk("nfsd: inode locked twice during operation.\n"); - err = fh_getattr(fhp, &fhp->fh_post_attr); + + if (!v4 || !inode->i_sb->s_export_op->fetch_iversion) + err = fh_getattr(fhp, &fhp->fh_post_attr); if (v4) fhp->fh_post_change = nfsd4_change_attribute(&fhp->fh_post_attr, inode); -- 2.28.0