Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3995778pxu; Mon, 30 Nov 2020 15:12:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyhWJ4DiJSg33BYanX5O3XnMv2/odyGIbGmQs5hZfnZ2pURCmYDorqu7Qha/OBtWw0UN/8U X-Received: by 2002:a17:906:c1c6:: with SMTP id bw6mr119867ejb.199.1606777975161; Mon, 30 Nov 2020 15:12:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606777975; cv=none; d=google.com; s=arc-20160816; b=KTKakk0SRrh6p8a7Tt8V2eBl2QrYWH8Sc4uOcn29JYzeWIcnoMZgj9vXcfZOkv2X+b pvG0Z0XNkcGyH0qMZk0KiWo10+6hwTvq1t2W/BFOBFL/0UMpLrKX3LXrMIfCyvSYFera R5gsMyejOqQ71aS03POZfKkBY0r+JSGmAiK+VX4FM8VudzX2puWzxDvM0KTfFrAnMiPV LI5SQD0CzDPxYcQFAjH6XixuGBJWdhO8X3QtZstuDm9BYYE2kmnSsOfTVaAm2aWAb8yy RyISqxJysiO177/ewI54TKT2ltWidkwyuuNr8S2ooQu6k/6RF3XAvo9waPiWNlGBC9Zf y17A== 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-signature:dkim-filter; bh=ZYD/zXHzIp8z2OpD1H0rkLMDIPS99GW8XcZxoCXi5vg=; b=D/LCMy63gyr5uvhdhwY5K909tVpeatc9qiHZkknzsn7IiR2XP2wPe+5m1D3iDCFWnw I6MMo+YKkoI69rMQPilpl/kCaKiXNAOLyeTjqgJilZn6djP6OptZ8Aqn9x0zRdPYy1HO SXjWsyaTJ2MhjkaSIRI/PbHAShpJ67S2o59tgh6idRTrGZwdn9YLhbQeLBFwHvvyqJvm k0Br5qZU4msqGqqj6HbP99z5mp1XSpYAq5i2x4Bt+4XWyaZVqeCtYnO6Na3P85Jr8Kut a9rktrcb6iJwB/pNOySeSOZp+IlmEHfMOtUImtwVV2pCOwErBkhJ+lSSDjPNmJ3F6hM6 e9hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fieldses.org header.s=default header.b="DWZXlc/n"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m26si14183316edp.318.2020.11.30.15.12.09; Mon, 30 Nov 2020 15:12:55 -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; dkim=pass header.i=@fieldses.org header.s=default header.b="DWZXlc/n"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729247AbgK3WrI (ORCPT + 99 others); Mon, 30 Nov 2020 17:47:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729053AbgK3WrI (ORCPT ); Mon, 30 Nov 2020 17:47:08 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1422BC0617A6 for ; Mon, 30 Nov 2020 14:46:21 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 6D8D64EEA; Mon, 30 Nov 2020 17:46:20 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 6D8D64EEA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fieldses.org; s=default; t=1606776380; bh=ZYD/zXHzIp8z2OpD1H0rkLMDIPS99GW8XcZxoCXi5vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DWZXlc/nsrpMCiwo/DiXjUPnTkpb+ouvfFdNEYCra3VfrZW+QUcqRYsE6gHBmnEGE dC8U1TJGaB3tFI78QzkzjeSy2hKK9Us2SGhn0cK5UP+QbmQ4taWOmQgPI3Znc4GsvE 2DzDyBe/oXjD9YAaclmWB4lcguu4mFibPi/Uw6/Q= From: "J. Bruce Fields" To: Chuck Lever Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 4/5] nfsd4: don't query change attribute in v2/v3 case Date: Mon, 30 Nov 2020 17:46:17 -0500 Message-Id: <1606776378-22381-4-git-send-email-bfields@fieldses.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1606776378-22381-1-git-send-email-bfields@fieldses.org> References: <1606776378-22381-1-git-send-email-bfields@fieldses.org> 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 dfbf390ff40c..f4fd54dc6965 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,6 +286,8 @@ 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) @@ -293,11 +296,12 @@ void fill_post_wcc(struct svc_fh *fhp) err = fh_getattr(fhp, &fhp->fh_post_attr); if (err) { fhp->fh_post_saved = false; - 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; - 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); } /* -- 2.28.0