diff mbox series

[v2,44/92] fat: convert to ctime accessor functions

Message ID	20230705190309.579783-42-jlayton@kernel.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Jeff Layton <jlayton@kernel.org> To: Christian Brauner <brauner@kernel.org>, OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Al Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 44/92] fat: convert to ctime accessor functions Date: Wed, 5 Jul 2023 15:01:09 -0400 Message-ID: <20230705190309.579783-42-jlayton@kernel.org> In-Reply-To: <20230705190309.579783-1-jlayton@kernel.org> References: <20230705185755.579053-1-jlayton@kernel.org> <20230705190309.579783-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[v2,01/92] ibmvmc: update ctime in conjunction with mtime on write \| [v2,01/92] ibmvmc: update ctime in conjunction with mtime on write [v2,02/92] bfs: update ctime in addition to mtime when adding entries [v2,03/92] efivarfs: update ctime when mtime changes on a write [v2,04/92] exfat: ensure that ctime is updated whenever the mtime is [v2,05/92] apparmor: update ctime whenever the mtime changes on an inode [v2,06/92] cifs: update the ctime on a partial page write [v2,09/92] btrfs: convert to simple_rename_timestamp [v2,10/92] ubifs: convert to simple_rename_timestamp [v2,11/92] shmem: convert to simple_rename_timestamp [v2,12/92] exfat: convert to simple_rename_timestamp [v2,13/92] ntfs3: convert to simple_rename_timestamp [v2,14/92] reiserfs: convert to simple_rename_timestamp [v2,15/92] spufs: convert to ctime accessor functions [v2,16/92] s390: convert to ctime accessor functions [v2,17/92] binderfs: convert to ctime accessor functions [v2,18/92] infiniband: convert to ctime accessor functions [v2,19/92] ibm: convert to ctime accessor functions [v2,20/92] usb: convert to ctime accessor functions [v2,21/92] 9p: convert to ctime accessor functions [v2,22/92] adfs: convert to ctime accessor functions [v2,23/92] affs: convert to ctime accessor functions [v2,24/92] afs: convert to ctime accessor functions [v2,25/92] fs: convert to ctime accessor functions [v2,26/92] autofs: convert to ctime accessor functions [v2,27/92] befs: convert to ctime accessor functions [v2,28/92] bfs: convert to ctime accessor functions [v2,29/92] btrfs: convert to ctime accessor functions [v2,30/92] ceph: convert to ctime accessor functions [v2,31/92] coda: convert to ctime accessor functions [v2,32/92] configfs: convert to ctime accessor functions [v2,33/92] cramfs: convert to ctime accessor functions [v2,34/92] debugfs: convert to ctime accessor functions [v2,35/92] devpts: convert to ctime accessor functions [v2,36/92] ecryptfs: convert to ctime accessor functions [v2,37/92] efivarfs: convert to ctime accessor functions [v2,38/92] efs: convert to ctime accessor functions [v2,39/92] erofs: convert to ctime accessor functions [v2,40/92] exfat: convert to ctime accessor functions [v2,41/92] ext2: convert to ctime accessor functions [v2,42/92] ext4: convert to ctime accessor functions [v2,43/92] f2fs: convert to ctime accessor functions [v2,44/92] fat: convert to ctime accessor functions [v2,45/92] freevxfs: convert to ctime accessor functions [v2,46/92] fuse: convert to ctime accessor functions [v2,47/92] gfs2: convert to ctime accessor functions [v2,48/92] hfs: convert to ctime accessor functions [v2,49/92] hfsplus: convert to ctime accessor functions [v2,50/92] hostfs: convert to ctime accessor functions [v2,51/92] hpfs: convert to ctime accessor functions [v2,52/92] hugetlbfs: convert to ctime accessor functions [v2,53/92] isofs: convert to ctime accessor functions [v2,54/92] jffs2: convert to ctime accessor functions [v2,55/92] jfs: convert to ctime accessor functions [v2,56/92] kernfs: convert to ctime accessor functions [v2,57/92] nfs: convert to ctime accessor functions [v2,58/92] nfsd: convert to ctime accessor functions [v2,59/92] nilfs2: convert to ctime accessor functions [v2,60/92] ntfs: convert to ctime accessor functions [v2,61/92] ntfs3: convert to ctime accessor functions [v2,62/92] ocfs2: convert to ctime accessor functions [v2,63/92] omfs: convert to ctime accessor functions [v2,64/92] openpromfs: convert to ctime accessor functions [v2,65/92] orangefs: convert to ctime accessor functions [v2,66/92] overlayfs: convert to ctime accessor functions [v2,67/92] procfs: convert to ctime accessor functions [v2,68/92] pstore: convert to ctime accessor functions [v2,69/92] qnx4: convert to ctime accessor functions [v2,70/92] qnx6: convert to ctime accessor functions [v2,71/92] ramfs: convert to ctime accessor functions [v2,72/92] reiserfs: convert to ctime accessor functions [v2,73/92] romfs: convert to ctime accessor functions [v2,74/92] smb: convert to ctime accessor functions [v2,75/92] squashfs: convert to ctime accessor functions [v2,76/92] sysv: convert to ctime accessor functions [v2,77/92] tracefs: convert to ctime accessor functions [v2,78/92] ubifs: convert to ctime accessor functions [v2,79/92] udf: convert to ctime accessor functions [v2,80/92] ufs: convert to ctime accessor functions [v2,81/92] vboxsf: convert to ctime accessor functions [v2,82/92] xfs: convert to ctime accessor functions [v2,83/92] zonefs: convert to ctime accessor functions [v2,84/92] linux: convert to ctime accessor functions [v2,85/92] mqueue: convert to ctime accessor functions [v2,86/92] bpf: convert to ctime accessor functions [v2,87/92] shmem: convert to ctime accessor functions [v2,88/92] sunrpc: convert to ctime accessor functions [v2,89/92] apparmor: convert to ctime accessor functions [v2,90/92] security: convert to ctime accessor functions [v2,91/92] selinux: convert to ctime accessor functions

Commit Message

Jeff Layton July 5, 2023, 7:01 p.m. UTC

  In later patches, we're going to change how the inode's ctime field is
used. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.

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

Comments

OGAWA Hirofumi July 6, 2023, 1:54 a.m. UTC | #1

Jeff Layton <jlayton@kernel.org> writes:

> @@ -1407,8 +1407,9 @@ static int fat_read_root(struct inode *inode)
>  	MSDOS_I(inode)->mmu_private = inode->i_size;
>  
>  	fat_save_attrs(inode, ATTR_DIR);
> -	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
> -	inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
> +	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
> +									0, 0).tv_sec;
> +	inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;

Maybe, this should simply be

	inode->i_mtime = inode->i_atime = inode_set_ctime(inode, 0, 0);

?

Thanks.

Jeff Layton July 6, 2023, 11:25 a.m. UTC | #2

On Thu, 2023-07-06 at 10:54 +0900, OGAWA Hirofumi wrote:
> Jeff Layton <jlayton@kernel.org> writes:
> 
> > @@ -1407,8 +1407,9 @@ static int fat_read_root(struct inode *inode)
> >  	MSDOS_I(inode)->mmu_private = inode->i_size;
> >  
> >  	fat_save_attrs(inode, ATTR_DIR);
> > -	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
> > -	inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
> > +	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
> > +									0, 0).tv_sec;
> > +	inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;
> 
> Maybe, this should simply be
> 
> 	inode->i_mtime = inode->i_atime = inode_set_ctime(inode, 0, 0);
> 

Yes, that would be clearer. Chalk that one up to the automated
coccinelle conversion. I've fixed it in my ctime-next branch.

Thanks!

diff mbox series

Patch

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index d99b8549ec8f..2be40ff8a74f 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -562,7 +562,7 @@  int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
 			   & ~((loff_t)sbi->cluster_size - 1)) >> 9;
 
 	fat_time_fat2unix(sbi, &inode->i_mtime, de->time, de->date, 0);
-	inode->i_ctime = inode->i_mtime;
+	inode_set_ctime_to_ts(inode, inode->i_mtime);
 	if (sbi->options.isvfat) {
 		fat_time_fat2unix(sbi, &inode->i_atime, 0, de->adate, 0);
 		fat_time_fat2unix(sbi, &MSDOS_I(inode)->i_crtime, de->ctime,
@@ -1407,8 +1407,9 @@  static int fat_read_root(struct inode *inode)
 	MSDOS_I(inode)->mmu_private = inode->i_size;
 
 	fat_save_attrs(inode, ATTR_DIR);
-	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
-	inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
+	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
+									0, 0).tv_sec;
+	inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;
 	set_nlink(inode, fat_subdirs(inode)+2);
 
 	return 0;
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 7e5d6ae305f2..67006ea08db6 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -332,7 +332,8 @@  int fat_truncate_time(struct inode *inode, struct timespec64 *now, int flags)
 	 * but ctime updates are ignored.
 	 */
 	if (flags & S_MTIME)
-		inode->i_mtime = inode->i_ctime = fat_truncate_mtime(sbi, now);
+		inode->i_mtime = inode_set_ctime_to_ts(inode,
+						       fat_truncate_mtime(sbi, now));
 
 	return 0;
 }