Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1627223pxb; Fri, 20 Nov 2020 14:41:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzy1XB+zZVzM2FjhlnLrcpCcK0NGjNaj1Mfqlb+9XF7Up2aFzIM7YYigN51eMHV+GNfjRP+ X-Received: by 2002:a50:bb66:: with SMTP id y93mr37449435ede.244.1605912077801; Fri, 20 Nov 2020 14:41:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605912077; cv=none; d=google.com; s=arc-20160816; b=DVtIWxqEbq7Ezr7hwfHzs/BsjP2t24qwdxDKM/RRANggMb+shyftKuQ9rRbHrhfBKH 1PzJSgF1yAsxoGS+1l+JuSByXHF95Mv2EJfUViIUdl7QJjtAlVUuxW/KYZzz9S7AWDnB pUEwx1Vstv9cFMWMjo3/BG0DZoLzoK+kTF8D2HPVkwVXW2tEG4ZqZoEBbxlIP+pvXhyV M8s++ZAUROn/qr9vU85HEHMUtkRKEku9IDkrmi5RbXXb1vzT044yOgBHs1DQ/j4hv8J+ qwuwseWt+ckuxgESp6OAKkyb11YkuCPNjcMl3BK4cO2c7aCC6KUwcvXlj1uDjceNB54q xIFg== 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=Ayngwb5A58fHf/pTdLG7VJqt/GhRw5blfP+oALJDZTw=; b=iPXF9r/y7QgVGt9mLUsLduaEt3oRWEqz8Gpsh4+ugKtgHEYaUpqJQ2KcdCag/rau+p Xs0oHXzmYA4OkIuxkrR697RRoHSIXTSxKw8TaYLdkvzvlijjtGDe8PNcUQm1oqf7qU+U mlmD5WBACN2+rPBxTIDi/50ov2rfg9+mPflukRM4TeUYXho3Ju9+lA0pUjTHXrIK1f60 qIsAq373KUz3OtVUMJfeHYN1sRPkL08ztJS3ECP/iFfXQ39azFtgmlPW5rGYFx7ZSR7D BCDNQbc0cHgTLx0r7GwXZu9cWR6cHlDFFHHppu/tKltWEByiwl4iCm0JA83qXXS1+dnx YllA== 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 f10si2517708edj.366.2020.11.20.14.40.55; Fri, 20 Nov 2020 14:41:17 -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 S1728891AbgKTWjY (ORCPT + 99 others); Fri, 20 Nov 2020 17:39:24 -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 S1728905AbgKTWjX (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 2E33DC061A4C for ; Fri, 20 Nov 2020 14:39:23 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 6D67E6E9F; Fri, 20 Nov 2020 17:39:22 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 6D67E6E9F From: "J. Bruce Fields" To: Jeff Layton Cc: Daire Byrne , Trond Myklebust , linux-cachefs , linux-nfs , "J. Bruce Fields" Subject: [PATCH 4/8] nfsd4: don't query change attribute in v2/v3 case Date: Fri, 20 Nov 2020 17:39:16 -0500 Message-Id: <1605911960-12516-4-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" inode_query_iversion() has side effects, and there's no point calling it when we're not even going to use it. We check whether we're currently processing a v4 request by checking fh_maxsize, which is arguably a little hacky; we could add a flag to svc_fh instead. Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs3xdr.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 2277f83da250..2732b04d3878 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -259,11 +259,11 @@ void fill_pre_wcc(struct svc_fh *fhp) { struct inode *inode; struct kstat stat; + bool v4 = (fhp->fh_maxsize == NFS4_FHSIZE); __be32 err; if (fhp->fh_pre_saved) return; - inode = d_inode(fhp->fh_dentry); err = fh_getattr(fhp, &stat); if (err) { @@ -272,11 +272,12 @@ void fill_pre_wcc(struct svc_fh *fhp) stat.ctime = inode->i_ctime; stat.size = inode->i_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_change = nfsd4_change_attribute(&stat, inode); fhp->fh_pre_saved = true; } @@ -285,18 +286,21 @@ void fill_pre_wcc(struct svc_fh *fhp) */ void fill_post_wcc(struct svc_fh *fhp) { + bool v4 = (fhp->fh_maxsize == NFS4_FHSIZE); + struct inode *inode = d_inode(fhp->fh_dentry); __be32 err; if (fhp->fh_post_saved) printk("nfsd: inode locked twice during operation.\n"); err = fh_getattr(fhp, &fhp->fh_post_attr); - fhp->fh_post_change = nfsd4_change_attribute(&fhp->fh_post_attr, - d_inode(fhp->fh_dentry)); + if (v4) + fhp->fh_post_change = + nfsd4_change_attribute(&fhp->fh_post_attr, inode); if (err) { fhp->fh_post_saved = false; /* Grab the ctime anyway - set_change_info might use it */ - fhp->fh_post_attr.ctime = d_inode(fhp->fh_dentry)->i_ctime; + fhp->fh_post_attr.ctime = inode->i_ctime; } else fhp->fh_post_saved = true; } -- 2.28.0