diff mbox series

[v2,40/92] exfat: convert to ctime accessor functions

Message ID	20230705190309.579783-38-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>, Namjae Jeon <linkinjeon@kernel.org>, Sungjong Seo <sj1557.seo@samsung.com> 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 40/92] exfat: convert to ctime accessor functions Date: Wed, 5 Jul 2023 15:01:05 -0400 Message-ID: <20230705190309.579783-38-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/exfat/file.c  |  4 ++--
 fs/exfat/inode.c |  6 +++---
 fs/exfat/namei.c | 21 +++++++++------------
 fs/exfat/super.c |  3 +--
 4 files changed, 15 insertions(+), 19 deletions(-)

Comments

Jan Kara July 6, 2023, 11:01 a.m. UTC | #1

On Wed 05-07-23 15:01:05, Jeff Layton wrote:
> 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>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/exfat/file.c  |  4 ++--
>  fs/exfat/inode.c |  6 +++---
>  fs/exfat/namei.c | 21 +++++++++------------
>  fs/exfat/super.c |  3 +--
>  4 files changed, 15 insertions(+), 19 deletions(-)
> 
> diff --git a/fs/exfat/file.c b/fs/exfat/file.c
> index 3cbd270e0cba..f40ecfeee3a4 100644
> --- a/fs/exfat/file.c
> +++ b/fs/exfat/file.c
> @@ -22,7 +22,7 @@ static int exfat_cont_expand(struct inode *inode, loff_t size)
>  	if (err)
>  		return err;
>  
> -	inode->i_ctime = inode->i_mtime = current_time(inode);
> +	inode->i_mtime = inode_set_ctime_current(inode);
>  	mark_inode_dirty(inode);
>  
>  	if (!IS_SYNC(inode))
> @@ -290,7 +290,7 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
>  	}
>  
>  	if (attr->ia_valid & ATTR_SIZE)
> -		inode->i_mtime = inode->i_ctime = current_time(inode);
> +		inode->i_mtime = inode_set_ctime_current(inode);
>  
>  	setattr_copy(&nop_mnt_idmap, inode, attr);
>  	exfat_truncate_atime(&inode->i_atime);
> diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c
> index 481dd338f2b8..13329baeafbc 100644
> --- a/fs/exfat/inode.c
> +++ b/fs/exfat/inode.c
> @@ -355,7 +355,7 @@ static void exfat_write_failed(struct address_space *mapping, loff_t to)
>  
>  	if (to > i_size_read(inode)) {
>  		truncate_pagecache(inode, i_size_read(inode));
> -		inode->i_mtime = inode->i_ctime = current_time(inode);
> +		inode->i_mtime = inode_set_ctime_current(inode);
>  		exfat_truncate(inode);
>  	}
>  }
> @@ -398,7 +398,7 @@ static int exfat_write_end(struct file *file, struct address_space *mapping,
>  		exfat_write_failed(mapping, pos+len);
>  
>  	if (!(err < 0) && !(ei->attr & ATTR_ARCHIVE)) {
> -		inode->i_mtime = inode->i_ctime = current_time(inode);
> +		inode->i_mtime = inode_set_ctime_current(inode);
>  		ei->attr |= ATTR_ARCHIVE;
>  		mark_inode_dirty(inode);
>  	}
> @@ -577,7 +577,7 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info)
>  
>  	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;
>  	inode->i_mtime = info->mtime;
> -	inode->i_ctime = info->mtime;
> +	inode_set_ctime_to_ts(inode, info->mtime);
>  	ei->i_crtime = info->crtime;
>  	inode->i_atime = info->atime;
>  
> diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c
> index e91022ff80ef..c007de6ac1c7 100644
> --- a/fs/exfat/namei.c
> +++ b/fs/exfat/namei.c
> @@ -569,7 +569,7 @@ static int exfat_create(struct mnt_idmap *idmap, struct inode *dir,
>  		goto unlock;
>  
>  	inode_inc_iversion(dir);
> -	dir->i_ctime = dir->i_mtime = current_time(dir);
> +	dir->i_mtime = inode_set_ctime_current(dir);
>  	if (IS_DIRSYNC(dir))
>  		exfat_sync_inode(dir);
>  	else
> @@ -582,8 +582,7 @@ static int exfat_create(struct mnt_idmap *idmap, struct inode *dir,
>  		goto unlock;
>  
>  	inode_inc_iversion(inode);
> -	inode->i_mtime = inode->i_atime = inode->i_ctime =
> -		EXFAT_I(inode)->i_crtime = current_time(inode);
> +	inode->i_mtime = inode->i_atime = EXFAT_I(inode)->i_crtime = inode_set_ctime_current(inode);
>  	exfat_truncate_atime(&inode->i_atime);
>  	/* timestamp is already written, so mark_inode_dirty() is unneeded. */
>  
> @@ -817,7 +816,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
>  	ei->dir.dir = DIR_DELETED;
>  
>  	inode_inc_iversion(dir);
> -	dir->i_mtime = dir->i_atime = dir->i_ctime = current_time(dir);
> +	dir->i_mtime = dir->i_atime = inode_set_ctime_current(dir);
>  	exfat_truncate_atime(&dir->i_atime);
>  	if (IS_DIRSYNC(dir))
>  		exfat_sync_inode(dir);
> @@ -825,7 +824,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
>  		mark_inode_dirty(dir);
>  
>  	clear_nlink(inode);
> -	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
> +	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
>  	exfat_truncate_atime(&inode->i_atime);
>  	exfat_unhash_inode(inode);
>  	exfat_d_version_set(dentry, inode_query_iversion(dir));
> @@ -852,7 +851,7 @@ static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,
>  		goto unlock;
>  
>  	inode_inc_iversion(dir);
> -	dir->i_ctime = dir->i_mtime = current_time(dir);
> +	dir->i_mtime = inode_set_ctime_current(dir);
>  	if (IS_DIRSYNC(dir))
>  		exfat_sync_inode(dir);
>  	else
> @@ -866,8 +865,7 @@ static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,
>  		goto unlock;
>  
>  	inode_inc_iversion(inode);
> -	inode->i_mtime = inode->i_atime = inode->i_ctime =
> -		EXFAT_I(inode)->i_crtime = current_time(inode);
> +	inode->i_mtime = inode->i_atime = EXFAT_I(inode)->i_crtime = inode_set_ctime_current(inode);
>  	exfat_truncate_atime(&inode->i_atime);
>  	/* timestamp is already written, so mark_inode_dirty() is unneeded. */
>  
> @@ -979,7 +977,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
>  	ei->dir.dir = DIR_DELETED;
>  
>  	inode_inc_iversion(dir);
> -	dir->i_mtime = dir->i_atime = dir->i_ctime = current_time(dir);
> +	dir->i_mtime = dir->i_atime = inode_set_ctime_current(dir);
>  	exfat_truncate_atime(&dir->i_atime);
>  	if (IS_DIRSYNC(dir))
>  		exfat_sync_inode(dir);
> @@ -988,7 +986,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
>  	drop_nlink(dir);
>  
>  	clear_nlink(inode);
> -	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
> +	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
>  	exfat_truncate_atime(&inode->i_atime);
>  	exfat_unhash_inode(inode);
>  	exfat_d_version_set(dentry, inode_query_iversion(dir));
> @@ -1353,8 +1351,7 @@ static int exfat_rename(struct mnt_idmap *idmap,
>  			exfat_warn(sb, "abnormal access to an inode dropped");
>  			WARN_ON(new_inode->i_nlink == 0);
>  		}
> -		new_inode->i_ctime = EXFAT_I(new_inode)->i_crtime =
> -			current_time(new_inode);
> +		EXFAT_I(new_inode)->i_crtime = inode_set_ctime_current(new_inode);
>  	}
>  
>  unlock:
> diff --git a/fs/exfat/super.c b/fs/exfat/super.c
> index 8c32460e031e..8e0ca4b0fc8f 100644
> --- a/fs/exfat/super.c
> +++ b/fs/exfat/super.c
> @@ -379,8 +379,7 @@ static int exfat_read_root(struct inode *inode)
>  	ei->i_size_ondisk = i_size_read(inode);
>  
>  	exfat_save_attr(inode, ATTR_SUBDIR);
> -	inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =
> -		current_time(inode);
> +	inode->i_mtime = inode->i_atime = ei->i_crtime = inode_set_ctime_current(inode);
>  	exfat_truncate_atime(&inode->i_atime);
>  	return 0;
>  }
> -- 
> 2.41.0
>

diff mbox series

Patch

diff --git a/fs/exfat/file.c b/fs/exfat/file.c
index 3cbd270e0cba..f40ecfeee3a4 100644
--- a/fs/exfat/file.c
+++ b/fs/exfat/file.c
@@ -22,7 +22,7 @@  static int exfat_cont_expand(struct inode *inode, loff_t size)
 	if (err)
 		return err;
 
-	inode->i_ctime = inode->i_mtime = current_time(inode);
+	inode->i_mtime = inode_set_ctime_current(inode);
 	mark_inode_dirty(inode);
 
 	if (!IS_SYNC(inode))
@@ -290,7 +290,7 @@  int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
 	}
 
 	if (attr->ia_valid & ATTR_SIZE)
-		inode->i_mtime = inode->i_ctime = current_time(inode);
+		inode->i_mtime = inode_set_ctime_current(inode);
 
 	setattr_copy(&nop_mnt_idmap, inode, attr);
 	exfat_truncate_atime(&inode->i_atime);
diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c
index 481dd338f2b8..13329baeafbc 100644
--- a/fs/exfat/inode.c
+++ b/fs/exfat/inode.c
@@ -355,7 +355,7 @@  static void exfat_write_failed(struct address_space *mapping, loff_t to)
 
 	if (to > i_size_read(inode)) {
 		truncate_pagecache(inode, i_size_read(inode));
-		inode->i_mtime = inode->i_ctime = current_time(inode);
+		inode->i_mtime = inode_set_ctime_current(inode);
 		exfat_truncate(inode);
 	}
 }
@@ -398,7 +398,7 @@  static int exfat_write_end(struct file *file, struct address_space *mapping,
 		exfat_write_failed(mapping, pos+len);
 
 	if (!(err < 0) && !(ei->attr & ATTR_ARCHIVE)) {
-		inode->i_mtime = inode->i_ctime = current_time(inode);
+		inode->i_mtime = inode_set_ctime_current(inode);
 		ei->attr |= ATTR_ARCHIVE;
 		mark_inode_dirty(inode);
 	}
@@ -577,7 +577,7 @@  static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info)
 
 	inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >> 9;
 	inode->i_mtime = info->mtime;
-	inode->i_ctime = info->mtime;
+	inode_set_ctime_to_ts(inode, info->mtime);
 	ei->i_crtime = info->crtime;
 	inode->i_atime = info->atime;
 
diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c
index e91022ff80ef..c007de6ac1c7 100644
--- a/fs/exfat/namei.c
+++ b/fs/exfat/namei.c
@@ -569,7 +569,7 @@  static int exfat_create(struct mnt_idmap *idmap, struct inode *dir,
 		goto unlock;
 
 	inode_inc_iversion(dir);
-	dir->i_ctime = dir->i_mtime = current_time(dir);
+	dir->i_mtime = inode_set_ctime_current(dir);
 	if (IS_DIRSYNC(dir))
 		exfat_sync_inode(dir);
 	else
@@ -582,8 +582,7 @@  static int exfat_create(struct mnt_idmap *idmap, struct inode *dir,
 		goto unlock;
 
 	inode_inc_iversion(inode);
-	inode->i_mtime = inode->i_atime = inode->i_ctime =
-		EXFAT_I(inode)->i_crtime = current_time(inode);
+	inode->i_mtime = inode->i_atime = EXFAT_I(inode)->i_crtime = inode_set_ctime_current(inode);
 	exfat_truncate_atime(&inode->i_atime);
 	/* timestamp is already written, so mark_inode_dirty() is unneeded. */
 
@@ -817,7 +816,7 @@  static int exfat_unlink(struct inode *dir, struct dentry *dentry)
 	ei->dir.dir = DIR_DELETED;
 
 	inode_inc_iversion(dir);
-	dir->i_mtime = dir->i_atime = dir->i_ctime = current_time(dir);
+	dir->i_mtime = dir->i_atime = inode_set_ctime_current(dir);
 	exfat_truncate_atime(&dir->i_atime);
 	if (IS_DIRSYNC(dir))
 		exfat_sync_inode(dir);
@@ -825,7 +824,7 @@  static int exfat_unlink(struct inode *dir, struct dentry *dentry)
 		mark_inode_dirty(dir);
 
 	clear_nlink(inode);
-	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
 	exfat_truncate_atime(&inode->i_atime);
 	exfat_unhash_inode(inode);
 	exfat_d_version_set(dentry, inode_query_iversion(dir));
@@ -852,7 +851,7 @@  static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,
 		goto unlock;
 
 	inode_inc_iversion(dir);
-	dir->i_ctime = dir->i_mtime = current_time(dir);
+	dir->i_mtime = inode_set_ctime_current(dir);
 	if (IS_DIRSYNC(dir))
 		exfat_sync_inode(dir);
 	else
@@ -866,8 +865,7 @@  static int exfat_mkdir(struct mnt_idmap *idmap, struct inode *dir,
 		goto unlock;
 
 	inode_inc_iversion(inode);
-	inode->i_mtime = inode->i_atime = inode->i_ctime =
-		EXFAT_I(inode)->i_crtime = current_time(inode);
+	inode->i_mtime = inode->i_atime = EXFAT_I(inode)->i_crtime = inode_set_ctime_current(inode);
 	exfat_truncate_atime(&inode->i_atime);
 	/* timestamp is already written, so mark_inode_dirty() is unneeded. */
 
@@ -979,7 +977,7 @@  static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
 	ei->dir.dir = DIR_DELETED;
 
 	inode_inc_iversion(dir);
-	dir->i_mtime = dir->i_atime = dir->i_ctime = current_time(dir);
+	dir->i_mtime = dir->i_atime = inode_set_ctime_current(dir);
 	exfat_truncate_atime(&dir->i_atime);
 	if (IS_DIRSYNC(dir))
 		exfat_sync_inode(dir);
@@ -988,7 +986,7 @@  static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
 	drop_nlink(dir);
 
 	clear_nlink(inode);
-	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
 	exfat_truncate_atime(&inode->i_atime);
 	exfat_unhash_inode(inode);
 	exfat_d_version_set(dentry, inode_query_iversion(dir));
@@ -1353,8 +1351,7 @@  static int exfat_rename(struct mnt_idmap *idmap,
 			exfat_warn(sb, "abnormal access to an inode dropped");
 			WARN_ON(new_inode->i_nlink == 0);
 		}
-		new_inode->i_ctime = EXFAT_I(new_inode)->i_crtime =
-			current_time(new_inode);
+		EXFAT_I(new_inode)->i_crtime = inode_set_ctime_current(new_inode);
 	}
 
 unlock:
diff --git a/fs/exfat/super.c b/fs/exfat/super.c
index 8c32460e031e..8e0ca4b0fc8f 100644
--- a/fs/exfat/super.c
+++ b/fs/exfat/super.c
@@ -379,8 +379,7 @@  static int exfat_read_root(struct inode *inode)
 	ei->i_size_ondisk = i_size_read(inode);
 
 	exfat_save_attr(inode, ATTR_SUBDIR);
-	inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =
-		current_time(inode);
+	inode->i_mtime = inode->i_atime = ei->i_crtime = inode_set_ctime_current(inode);
 	exfat_truncate_atime(&inode->i_atime);
 	return 0;
 }