From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB8CFC77B70 for ; Tue, 11 Apr 2023 14:37:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C80F28000D; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39E5228000C; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21AED28000D; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1109828000C for ; Tue, 11 Apr 2023 10:37:13 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id ACA62C0DC0 for ; Tue, 11 Apr 2023 14:37:12 +0000 (UTC) X-FDA: 80669362704.14.54564AD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id EEB64180008 for ; Tue, 11 Apr 2023 14:37:10 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cQNlku1p; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681223831; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VVCfke3ZCxYsghQLpATwfwjekyzkEVZd5h7+Voop3jo=; b=JOcsLsrdzJyvESvhE9rCp0ztDg2hnV4ZgIY81fBHpy66rEqaT22w4qd7l17SdYQqI1WYEe 3Cl5AR2lfp3NzbdbQdDugFZM7Ai4D7mfpu+d0nkbd0ybL8aBo31FWEWEKKcCtun8GhP+xK oyfXu53ZiznFBUXiAsuShyt3JOVPeHY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cQNlku1p; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf24.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681223831; a=rsa-sha256; cv=none; b=IW3vdfIx9pJCOCKVoHzkYJlj4UyH5Wiao1DRL2UdopRMci28o12puaXsrFu6D7eJPcXtOd /LdwGRaw9+YJoyxMaXyrEiqKuHaZwJ276Q3qbeu6ZI1GU4jzu6jMXvSkMdbAcjdK/txy0u hkGsAqwd89Xb7S+2x8d+Pu4KRoBLfOc= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 283FF627A7; Tue, 11 Apr 2023 14:37:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EC48C4339B; Tue, 11 Apr 2023 14:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681223829; bh=6y1YeGPH/VDzbluu556WvHbrgod71MAnILEUbvu4oy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cQNlku1pazVGncUWRx6qcHm6ifnv8sATVSHRKxJ+yY9eE7eZUTJ1MvQPtsi6GmZQh CIci0d5QfRGC+dn021LTgnJrIA7miBSo+7bvIROxUDMGpstq9TFdp6YPoP8yCErw5J ANLVN5W6Vjyqz+/dCCiya7aeQLN4jsUaghqIvPNn8u8V+fAdJATUbb4O61i6xzbhDR gqaprupHoJDVo5yOrqqQmQgXPx9YlX1UqTDqn/8x+OhA73X/k5OLF2xQ0F9Mr54kwy nT8/LqdngILXsJDLLui6MLofTHvAepeYHJwEHQhFKE91V2z/utO5dt2Nj+T55loUBF lxvpzL8s6FpCA== From: Jeff Layton To: Alexander Viro , Christian Brauner , "Darrick J. Wong" , Hugh Dickins , Andrew Morton , Dave Chinner , Chuck Lever Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org Subject: [RFC PATCH 3/3][RESEND] xfs: mark the inode for high-res timestamp update in getattr Date: Tue, 11 Apr 2023 10:37:02 -0400 Message-Id: <20230411143702.64495-4-jlayton@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411143702.64495-1-jlayton@kernel.org> References: <20230411143702.64495-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: EEB64180008 X-Stat-Signature: ka94aaqdkbhmcb33zcnixrcxxk98umg9 X-HE-Tag: 1681223830-838388 X-HE-Meta: U2FsdGVkX18VZVshKSpFsBpNVq7rnXHAbYFRHitO3cqQ+zMfACRjkXCzkzOw7vt4n6ZK2QJIFyAr9pi1/E5dQGbq8mFUkrb0IK7ObWBLJs3bKB3htnD/TYd/i7n43fFeK2hNK+kDNLnVqVcrh7qNu4UmjRuCbrIrXWDlrec4pKpMMZ7QpExx5Fhtz2Z54YoizNHUfYD7KDPHiq5bywIjwYKKwe0fY8L8BLcFijOvSB7m8/RKN2jTk8spf0Z7ZpugvBeofyJLfoPocv7Mn333rwXUJbw1YWKyPO/jes7+HsnXDsMdEN+ZIXoFUewmdxf8PomAhqeK0ZMRmWpIhgcLIryCVNmvYhe4mNT+b3dkKSxGnovGdSsHXh1uG3Wos1pWvqNOO3QK9vLta/Arh5OqefbhhVhkYkHpEvZ2prb/zLaiRnTJD4UL8XWJNq90nJ9tojxOpYeQmvitRkkTWaLzktCtKLilkeY6ynrbE2QbbPfZA/LbmQbCBWuPbjIYCozUS5ACVrj7w64aV4yxB5YPAVylPmGuIL41dne3bQlXh3/WR0dfCoIaWY6ceZEDGIWlpXJo0Cb4JzvyDYZHBTKLNLSk8ViV4H+tNvT8HRB00XRW9pDIfceyRRVMwVsZ5Won16YA0Edzcz7VE2EbGrRmfzW/x2/IKwqP3TGypmgGwzrIo3a3800hK9dyDDYTbEoIsTRMu3CIUQ28VqDOqJyBaJ7ji8bnh65IHSPuoWJ1b0Rn+axJjDLKd/9yCu3AYHZdO3DnHXDNBJCF1bKgIb891+TpgS19PVQInpBimVMU0V4IgKOPBU7cCvLdM2zVtybpDpWPbAK6g3k2B9vWGju9QIfuj/zmErw+gXQABEbnPRtMVsCEsbAZQQhTMlmvnYoukDL9v1xhytGmouRvhO5ki34KZDTSfGm4KKs2XzGooFo1VZfk+inPLaIIPMxbLkeOPzNm4xp3iItBMOrDVLn cvyy7mLP 2WKO24s9wn7mXV6ctrPY/Jk9Yp7AlIVpZUg3TXFsJJih10eNqNEpTtLIAdFYbevs2fDTUrWxiF7g/lcg0dtU3a1NatCr6ZRBRpdSr7h3Nmhgk715xi7BNLHQZl3ETzbdQivt+Nhz6PPwncipgWfcbdW2X7lzNG41Hir2UnoAsAF+95BjUaE4NVUsAQ5jmEZGSAPD++G7iVUBbOIzPIRMNU1/E5AaZ+d1Cx+QA/iIlP7Rbu0ddxrbVIDlcTGoSkSAjqwlZh9+UMYYdC9Jv2p7Go9eAIxX+nhjqOWeWlUMy5tagB1JMvz0Hly96P7EGqw56jFVisK8HyIHS2geVza7YXMCdtpDG+xAbYcoG X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: When the mtime or ctime is being queried via getattr, ensure that we mark the inode for a high-res timestamp update on the next pass. Also, switch to current_cmtime for other c/mtime updates. With this change, we're better off having the NFS server just ignore the i_version field and have it use the ctime instead, so clear the STATX_CHANGE_COOKIE flag in the result mask in ->getattr. Signed-off-by: Jeff Layton --- fs/xfs/libxfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_acl.c | 2 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_iops.c | 15 ++++++++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c index 8b5547073379..9ad7c229c617 100644 --- a/fs/xfs/libxfs/xfs_trans_inode.c +++ b/fs/xfs/libxfs/xfs_trans_inode.c @@ -63,7 +63,7 @@ xfs_trans_ichgtime( ASSERT(tp); ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - tv = current_time(inode); + tv = current_cmtime(inode); if (flags & XFS_ICHGTIME_MOD) inode->i_mtime = tv; diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 791db7d9c849..461adc58cf8c 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -233,7 +233,7 @@ xfs_acl_set_mode( xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); inode->i_mode = mode; - inode->i_ctime = current_time(inode); + inode->i_ctime = current_cmtime(inode); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); if (xfs_has_wsync(mp)) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 5808abab786c..80f9d731e261 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -843,7 +843,7 @@ xfs_init_new_inode( ip->i_df.if_nextents = 0; ASSERT(ip->i_nblocks == 0); - tv = current_time(inode); + tv = current_cmtime(inode); inode->i_mtime = tv; inode->i_atime = tv; inode->i_ctime = tv; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 24718adb3c16..a0b07f90e16c 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -565,6 +565,15 @@ xfs_vn_getattr( if (xfs_is_shutdown(mp)) return -EIO; + /* + * XFS uses the i_version infrastructure to track any change to + * the inode, including atime updates. This means that the i_version + * returned by getattr doesn't conform to what the callers expect. + * Clear it here so that nfsd will fake up a change cookie from the + * ctime instead. + */ + stat->result_mask &= ~STATX_CHANGE_COOKIE; + stat->size = XFS_ISIZE(ip); stat->dev = inode->i_sb->s_dev; stat->mode = inode->i_mode; @@ -573,8 +582,8 @@ xfs_vn_getattr( stat->gid = vfsgid_into_kgid(vfsgid); stat->ino = ip->i_ino; stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; - stat->ctime = inode->i_ctime; + if (request_mask & (STATX_CTIME|STATX_MTIME)) + fill_cmtime_and_mark(inode, stat); stat->blocks = XFS_FSB_TO_BB(mp, ip->i_nblocks + ip->i_delayed_blks); if (xfs_has_v3inodes(mp)) { @@ -917,7 +926,7 @@ xfs_setattr_size( if (newsize != oldsize && !(iattr->ia_valid & (ATTR_CTIME | ATTR_MTIME))) { iattr->ia_ctime = iattr->ia_mtime = - current_time(inode); + current_cmtime(inode); iattr->ia_valid |= ATTR_CTIME | ATTR_MTIME; } -- 2.39.2