From patchwork Mon Jul 8 15:53:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13726776 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 5AA7AC3DA42 for ; Mon, 8 Jul 2024 15:54:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E203C6B009E; Mon, 8 Jul 2024 11:54:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD0606B009F; Mon, 8 Jul 2024 11:54:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4A2E6B00A0; Mon, 8 Jul 2024 11:54:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A58986B009E for ; Mon, 8 Jul 2024 11:54:07 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 25CBA413AF for ; Mon, 8 Jul 2024 15:54:07 +0000 (UTC) X-FDA: 82317031734.28.4AEE543 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf15.hostedemail.com (Postfix) with ESMTP id A0F03A0028 for ; Mon, 8 Jul 2024 15:54:04 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EXc8Q6z/"; spf=pass (imf15.hostedemail.com: domain of jlayton@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720454030; a=rsa-sha256; cv=none; b=HrgH1gYCkCSrthnVFoIg3zRsCKmpHlde1EzWTUm+IJAQTMnJj/ry4ARHgILCV+ytpuJwsZ gsS0zUlXWpbNLRrcNL8PaiwNOIL/eneYjqxPLwxav967pkEsgclWI/qJUAyRVuT5zXNERx l7gzTPevbKdjasyLNz4eV6xXeIxFOGU= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EXc8Q6z/"; spf=pass (imf15.hostedemail.com: domain of jlayton@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720454030; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3Jh+/RkL/JMZmQsliXtD8/KiOzj+g0LqxKDnzgwCyRQ=; b=2Yw74NGczsTTRvfOOTxusPw5KT5vCJjV28igTB8XlfOSuPmp9jHdqS7mCFxIgBU1Ii0ytu 7Eae7r8HZ7YCG4NljxR+NqZNlNTOEifqrGOWHzmMQF/LixqA66Oh5v3gn0IRL9uV0DAQit 4T2g06UyJo7H0OtQwSGr3jQs4wTo7UI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 8A0FACE0E1E; Mon, 8 Jul 2024 15:54:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CAF8C116B1; Mon, 8 Jul 2024 15:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720454040; bh=fHx/mgJgehSKKeWi0EcYG4swNcOzJbq5fDt162sYPoU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=EXc8Q6z/aA2iTbREyS3/WYORlttsAC9FwB+JrPR10EM/hOgWC3OmmPTatPQ7d5ZBK kUaYZpsX/6HPobJ4W/+IWz3lQRfBIhUqrC711O6DOSp//+rx8t+N6q+uwoPffBnRsY 0kfEB/LKf/3wlX3DOUKRz7m79YYVSaYkPbvPNQykmKrSy40XI+TvAA61vXTM7rY8l0 0XAtOI15t2eU02duhM8H2AD/8ivNp38watuSC449U1tQYed6ZzsmoAuOL9KDrI8sbV I/4vbT3RgYKakJu5l1YLmpI8ryXYoKzVvNOmFKSMjn8T27D5hx7aAVF47h5/k83RlA uAaL9ZTAMWzbQ== From: Jeff Layton Date: Mon, 08 Jul 2024 11:53:39 -0400 Subject: [PATCH v4 6/9] xfs: switch to multigrain timestamps MIME-Version: 1.0 Message-Id: <20240708-mgtime-v4-6-a0f3c6fb57f3@kernel.org> References: <20240708-mgtime-v4-0-a0f3c6fb57f3@kernel.org> In-Reply-To: <20240708-mgtime-v4-0-a0f3c6fb57f3@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Chandan Babu R , "Darrick J. Wong" , Theodore Ts'o , Andreas Dilger , Chris Mason , Josef Bacik , David Sterba , Hugh Dickins , Andrew Morton , Jonathan Corbet Cc: Dave Chinner , Andi Kleen , Christoph Hellwig , Uros Bizjak , Kent Overstreet , kernel-team@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-doc@vger.kernel.org, Jeff Layton X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2796; i=jlayton@kernel.org; h=from:subject:message-id; bh=fHx/mgJgehSKKeWi0EcYG4swNcOzJbq5fDt162sYPoU=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBmjAuEMx+U894kzOliT8PIHuyLbuEhBDG/6A47f TNcoicTlx2JAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZowLhAAKCRAADmhBGVaC FW32EACrJh37KQ3iCcP1FmPHSbhmc3lsquIR/ezsNSLqPcIYhcO6b9Vji3XCEokY8WXsfjZAZS8 R9/+Nnm6TSKeljPkYd+yPMpxp3T0jxCZkvYRyED/848A9fnnKx6OeAi4SzryA45leaHiEDRVQCX J9PNYkvOrJfs15fqhqL8nqcLhztTzgYMwkCn3n24dTD+XFq05JTkLQaEFCmqIdnfyZoOp5Aj9D9 paE+DUcx3iSah3f8GTFvejGBO+Q+WDqiiyeB4sMTFdyQ4tyZqjyaDmFaF2lSPMVPiNxtIAFP0f8 FRuiDB5CmvAuClW/3zBlLB3y8m8UWxME46t6vY/qCskxnnJDiV5wUCpEqfRzrgAfX3tBlS+WhOo 5BvmR6xrJoVht0jwBuaK7T0zoCHWETivxG73i+V3aGxLQYgmmGIHej7twpu31xi3l1aMcgrSi8B SS04qjk84jJYZ6VcN5OdQBr+Ol5ERg8nMNrIroer/1TZH34Gws3pLYcLBCiuYRPm4aaGSz8f0CA Nl4yZxGznM04yrrOSc6UZGA3z/cjiTfbo+I2W1pHGlFogwZglJkcgrLwGcsnpSVbHAspi/ONUAk 3dVo8oTmiJCSEQ9+rVTAHNKlHWvqEsqGr2WU1deWTKbhAptpG9VJm4ocBvFjV3t5AAfuZfiCfIe ABq16uwiRuXRIZw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-Stat-Signature: jjsxjt678jgpxmy1gf6omjwp1zzcpbuc X-Rspamd-Queue-Id: A0F03A0028 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1720454044-569514 X-HE-Meta: U2FsdGVkX19L6IU6bCyaeHWIuZ82eVuK9LJCiNcT/3tpgcbR8u1dNJN3YGWwBEzxJYoJYXybme29pVj5OLaAUUpv47Qg0vec9J75HbFUJzRdQ97idtBDOPch1oF6bdowYoEPYDI1D6dp5+d5iQjAYYZvuOYaztJrC49XjYFxk8uLzF0yEg1V6x9F8DM+joBRcKZdY1VwJz/+blciQxoBUUkO/0t1GSDviy+5WwkLs9w7uIfiq9xNRcYN7XWhEqobGmvDfiJZ4XWDG1h2q9RNuCYfBIDYJcD+7XT6iv8WiL8zmf7lIG3CR5WIzUTVqW25gW3HDVmLNZlCArsx9Ze9uXYKwyRy4T1M3g+M8jpG8j4GwovUdExwgn51SLSfZZOFYMzAZGsVwvrOD6o8Y58+W4lheuGn3cz8BY/tgis+At9tluJeThoGCfDlaOI1LHmIVPjwOOgzUc8dGziwPEUfZgeRnWtNKwy9Q9JtGNXwCNofRA1gfDS7iLP9qrZK1oVMVYb3RNRVaFjswUPt2Mo8EwJyNZpuHYbUWtQoTYya1J6bQl02U7uldm8bceZXPODnuNMjbbjDKKavigEcC7HE8ViQ01tt4u70xleqdRQOkNiy+2SfMWDH/MR5Y8yOiIenBpvUug6tioxxNNMqaQLtQTjeGpLMOvRZdva/eqhFfVKDLlhInG8B+8LTPjTcCyQ0Y66LYgY72r7wH1p+rw7NCtJQZ3cszpKZwCcPSCbWrTfe2SwNCV9dX0JQd4S73c0QGoZHRaHpC1gmvHOhMmU6fqWMzJFlPZdwaCZMi4OLChy8fxfOoULuIeM1HTvMID5gVm7ibf68tQl/JU4caGQk5JrQ/Aczpy6qY3pSn0EdgXfV1YqIN/ZsufoBr6RZqbA9V+aoaWamYp590ksf2coRzoyBS53VvOBAkCOcTMLD2hcseNdxe9tc2hZwvdKoqObsUWw/5ffLuLrPMqzaDUe SmYCDZdA mBt8o+TJo7tmuBVUOk/D8+uJw4FKMxJSRT1mtiGlbIPZOKlSC0WrYsh8KDIu8CDYQaRS+z9SUPx3qRazL5mEyPiu0YpYlxSVPNCSqdMf35ejDm5vqU5nRVN7Kv7ymfRPmZPF9fsFxEKHcHHVEbRMXujJYvNjLWksRnybEwM9+0RGIy+yg71XlX1SnPVgrP6eJA4LYwjNv3twlG3FHZXU7iCdkcF6VqW334D3bL2w2xYAXMfKD4BOVTtMgyxG2pQUkIZgvqzb/PVjTYXpkzLbedKfUAKM8rQKbfR4kQ4Tgeuye52ay4GZUZIx7rzHP5EvCLEGhTbyXkECc0eX/7RKPi4HLWB8Jy0eSLO3WHm/ra5Jvyb0= 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: List-Subscribe: List-Unsubscribe: Enable multigrain timestamps, which should ensure that there is an apparent change to the timestamp whenever it has been written after being actively observed via getattr. Also, anytime the mtime changes, the ctime must also change, and those are now the only two options for xfs_trans_ichgtime. Have that function unconditionally bump the ctime, and ASSERT that XFS_ICHGTIME_CHG is always set. Finally, stop setting STATX_CHANGE_COOKIE in getattr, since the ctime should give us better semantics now. Signed-off-by: Jeff Layton --- fs/xfs/libxfs/xfs_trans_inode.c | 6 +++--- fs/xfs/xfs_iops.c | 10 +++------- fs/xfs/xfs_super.c | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c index 69fc5b981352..1f3639bbf5f0 100644 --- a/fs/xfs/libxfs/xfs_trans_inode.c +++ b/fs/xfs/libxfs/xfs_trans_inode.c @@ -62,12 +62,12 @@ xfs_trans_ichgtime( ASSERT(tp); xfs_assert_ilocked(ip, XFS_ILOCK_EXCL); - tv = current_time(inode); + /* If the mtime changes, then ctime must also change */ + ASSERT(flags & XFS_ICHGTIME_CHG); + tv = inode_set_ctime_current(inode); if (flags & XFS_ICHGTIME_MOD) inode_set_mtime_to_ts(inode, tv); - if (flags & XFS_ICHGTIME_CHG) - inode_set_ctime_to_ts(inode, tv); if (flags & XFS_ICHGTIME_CREATE) ip->i_crtime = tv; } diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index a00dcbc77e12..d25872f818fa 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -592,8 +592,9 @@ xfs_vn_getattr( stat->gid = vfsgid_into_kgid(vfsgid); stat->ino = ip->i_ino; stat->atime = inode_get_atime(inode); - stat->mtime = inode_get_mtime(inode); - stat->ctime = inode_get_ctime(inode); + + fill_mg_cmtime(stat, request_mask, inode); + stat->blocks = XFS_FSB_TO_BB(mp, ip->i_nblocks + ip->i_delayed_blks); if (xfs_has_v3inodes(mp)) { @@ -603,11 +604,6 @@ xfs_vn_getattr( } } - if ((request_mask & STATX_CHANGE_COOKIE) && IS_I_VERSION(inode)) { - stat->change_cookie = inode_query_iversion(inode); - stat->result_mask |= STATX_CHANGE_COOKIE; - } - /* * Note: If you add another clause to set an attribute flag, please * update attributes_mask below. diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 27e9f749c4c7..210481b03fdb 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -2052,7 +2052,7 @@ static struct file_system_type xfs_fs_type = { .init_fs_context = xfs_init_fs_context, .parameters = xfs_fs_parameters, .kill_sb = xfs_kill_sb, - .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP, + .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME, }; MODULE_ALIAS_FS("xfs");