[PATCH v7 05/13] fat: make fat_update_time get its own timestamp

From: Jeff Layton <jlayton@kernel.org>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
	 Christian Brauner <brauner@kernel.org>,
	 Eric Van Hensbergen <ericvh@kernel.org>,
	 Latchesar Ionkov <lucho@ionkov.net>,
	 Dominique Martinet <asmadeus@codewreck.org>,
	 Christian Schoenebeck <linux_oss@crudebyte.com>,
	 David Howells <dhowells@redhat.com>,
	Marc Dionne <marc.dionne@auristor.com>,  Chris Mason <clm@fb.com>,
	Josef Bacik <josef@toxicpanda.com>,
	 David Sterba <dsterba@suse.com>, Xiubo Li <xiubli@redhat.com>,
	 Ilya Dryomov <idryomov@gmail.com>,
	Jan Harkes <jaharkes@cs.cmu.edu>,
	 coda@cs.cmu.edu, Tyler Hicks <code@tyhicks.com>,
	 Gao Xiang <xiang@kernel.org>, Chao Yu <chao@kernel.org>,
	 Yue Hu <huyue2@coolpad.com>,
	Jeffle Xu <jefflexu@linux.alibaba.com>,
	 Namjae Jeon <linkinjeon@kernel.org>,
	Sungjong Seo <sj1557.seo@samsung.com>,  Jan Kara <jack@suse.com>,
	Theodore Ts'o <tytso@mit.edu>,
	 Andreas Dilger <adilger.kernel@dilger.ca>,
	Jaegeuk Kim <jaegeuk@kernel.org>,
	 OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
	 Miklos Szeredi <miklos@szeredi.hu>,
	Bob Peterson <rpeterso@redhat.com>,
	 Andreas Gruenbacher <agruenba@redhat.com>,
	 Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Tejun Heo <tj@kernel.org>,
	 Trond Myklebust <trond.myklebust@hammerspace.com>,
	 Anna Schumaker <anna@kernel.org>,
	 Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
	 Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>,
	 Joseph Qi <joseph.qi@linux.alibaba.com>,
	 Mike Marshall <hubcap@omnibond.com>,
	 Martin Brandenburg <martin@omnibond.com>,
	 Luis Chamberlain <mcgrof@kernel.org>,
	Kees Cook <keescook@chromium.org>,
	 Iurii Zaikin <yzaikin@google.com>,
	Steve French <sfrench@samba.org>,
	 Paulo Alcantara <pc@manguebit.com>,
	 Ronnie Sahlberg <ronniesahlberg@gmail.com>,
	 Shyam Prasad N <sprasad@microsoft.com>,
	Tom Talpey <tom@talpey.com>,
	 Sergey Senozhatsky <senozhatsky@chromium.org>,
	 Richard Weinberger <richard@nod.at>,
	Hans de Goede <hdegoede@redhat.com>,
	 Hugh Dickins <hughd@google.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	 Amir Goldstein <amir73il@gmail.com>,
	"Darrick J. Wong" <djwong@kernel.org>,
	 Benjamin Coddington <bcodding@redhat.com>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	 v9fs@lists.linux.dev, linux-afs@lists.infradead.org,
	 linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org,
	 codalist@coda.cs.cmu.edu, ecryptfs@vger.kernel.org,
	 linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org,
	 linux-f2fs-devel@lists.sourceforge.net,
	cluster-devel@redhat.com,  linux-nfs@vger.kernel.org,
	ntfs3@lists.linux.dev,  ocfs2-devel@lists.linux.dev,
	devel@lists.orangefs.org,  linux-cifs@vger.kernel.org,
	samba-technical@lists.samba.org,  linux-mtd@lists.infradead.org,
	linux-mm@kvack.org,  linux-unionfs@vger.kernel.org,
	linux-xfs@vger.kernel.org,  Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v7 05/13] fat: make fat_update_time get its own timestamp
Date: Mon, 07 Aug 2023 15:38:36 -0400	[thread overview]
Message-ID: <20230807-mgctime-v7-5-d1dec143a704@kernel.org> (raw)
In-Reply-To: <20230807-mgctime-v7-0-d1dec143a704@kernel.org>

In later patches, we're going to drop the "now" parameter from the
update_time operation. Fix fat_update_time to fetch its own timestamp.
It turns out that this is easily done by just passing a NULL timestamp
pointer to fat_update_time.

Also, it may be that things have changed by the time we get to calling
fat_update_time after checking inode_needs_update_time. Ensure that we
attempt the i_version bump if any of the S_* flags besides S_ATIME are
set.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/fat/misc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 67006ea08db6..8cab87145d63 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -347,14 +347,14 @@ int fat_update_time(struct inode *inode, struct timespec64 *now, int flags)
 		return 0;
 
 	if (flags & (S_ATIME | S_CTIME | S_MTIME)) {
-		fat_truncate_time(inode, now, flags);
+		fat_truncate_time(inode, NULL, flags);
 		if (inode->i_sb->s_flags & SB_LAZYTIME)
 			dirty_flags |= I_DIRTY_TIME;
 		else
 			dirty_flags |= I_DIRTY_SYNC;
 	}
 
-	if ((flags & S_VERSION) && inode_maybe_inc_iversion(inode, false))
+	if ((flags & (S_VERSION|S_CTIME|S_MTIME)) && inode_maybe_inc_iversion(inode, false))
 		dirty_flags |= I_DIRTY_SYNC;
 
 	__mark_inode_dirty(inode, dirty_flags);

-- 
2.41.0

