diff mbox series

[v2,87/92] shmem: convert to ctime accessor functions

Message ID	20230705190309.579783-85-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>, Hugh Dickins <hughd@google.com>, Andrew Morton <akpm@linux-foundation.org> Cc: Al Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 87/92] shmem: convert to ctime accessor functions Date: Wed, 5 Jul 2023 15:01:52 -0400 Message-ID: <20230705190309.579783-85-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>
---
 mm/shmem.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Comments

Jan Kara July 6, 2023, 2:56 p.m. UTC | #1

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

> ---
>  mm/shmem.c | 22 ++++++++++++----------
>  1 file changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 1693134959c5..51aaaf479437 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -1064,7 +1064,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
>  void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
>  {
>  	shmem_undo_range(inode, lstart, lend, false);
> -	inode->i_ctime = inode->i_mtime = current_time(inode);
> +	inode->i_mtime = inode_set_ctime_current(inode);
>  	inode_inc_iversion(inode);
>  }
>  EXPORT_SYMBOL_GPL(shmem_truncate_range);
> @@ -1161,9 +1161,9 @@ static int shmem_setattr(struct mnt_idmap *idmap,
>  	if (attr->ia_valid & ATTR_MODE)
>  		error = posix_acl_chmod(idmap, dentry, inode->i_mode);
>  	if (!error && update_ctime) {
> -		inode->i_ctime = current_time(inode);
> +		inode_set_ctime_current(inode);
>  		if (update_mtime)
> -			inode->i_mtime = inode->i_ctime;
> +			inode->i_mtime = inode_get_ctime(inode);
>  		inode_inc_iversion(inode);
>  	}
>  	return error;
> @@ -2394,7 +2394,7 @@ static struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block
>  		inode->i_ino = ino;
>  		inode_init_owner(idmap, inode, dir, mode);
>  		inode->i_blocks = 0;
> -		inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
> +		inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
>  		inode->i_generation = get_random_u32();
>  		info = SHMEM_I(inode);
>  		memset(info, 0, (char *)inode - (char *)info);
> @@ -3110,7 +3110,7 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir,
>  			goto out_iput;
>  
>  		dir->i_size += BOGO_DIRENT_SIZE;
> -		dir->i_ctime = dir->i_mtime = current_time(dir);
> +		dir->i_mtime = inode_set_ctime_current(dir);
>  		inode_inc_iversion(dir);
>  		d_instantiate(dentry, inode);
>  		dget(dentry); /* Extra count - pin the dentry in core */
> @@ -3193,7 +3193,8 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr
>  	}
>  
>  	dir->i_size += BOGO_DIRENT_SIZE;
> -	inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode);
> +	dir->i_mtime = inode_set_ctime_to_ts(dir,
> +					     inode_set_ctime_current(inode));
>  	inode_inc_iversion(dir);
>  	inc_nlink(inode);
>  	ihold(inode);	/* New dentry reference */
> @@ -3213,7 +3214,8 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry)
>  	simple_offset_remove(shmem_get_offset_ctx(dir), dentry);
>  
>  	dir->i_size -= BOGO_DIRENT_SIZE;
> -	inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode);
> +	dir->i_mtime = inode_set_ctime_to_ts(dir,
> +					     inode_set_ctime_current(inode));
>  	inode_inc_iversion(dir);
>  	drop_nlink(inode);
>  	dput(dentry);	/* Undo the count from "create" - this does all the work */
> @@ -3360,7 +3362,7 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir,
>  		folio_put(folio);
>  	}
>  	dir->i_size += BOGO_DIRENT_SIZE;
> -	dir->i_ctime = dir->i_mtime = current_time(dir);
> +	dir->i_mtime = inode_set_ctime_current(dir);
>  	inode_inc_iversion(dir);
>  	d_instantiate(dentry, inode);
>  	dget(dentry);
> @@ -3438,7 +3440,7 @@ static int shmem_fileattr_set(struct mnt_idmap *idmap,
>  		(fa->flags & SHMEM_FL_USER_MODIFIABLE);
>  
>  	shmem_set_inode_flags(inode, info->fsflags);
> -	inode->i_ctime = current_time(inode);
> +	inode_set_ctime_current(inode);
>  	inode_inc_iversion(inode);
>  	return 0;
>  }
> @@ -3508,7 +3510,7 @@ static int shmem_xattr_handler_set(const struct xattr_handler *handler,
>  	name = xattr_full_name(handler, name);
>  	err = simple_xattr_set(&info->xattrs, name, value, size, flags, NULL);
>  	if (!err) {
> -		inode->i_ctime = current_time(inode);
> +		inode_set_ctime_current(inode);
>  		inode_inc_iversion(inode);
>  	}
>  	return err;
> -- 
> 2.41.0
>

diff mbox series

Patch

diff --git a/mm/shmem.c b/mm/shmem.c
index 1693134959c5..51aaaf479437 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1064,7 +1064,7 @@  static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
 void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
 {
 	shmem_undo_range(inode, lstart, lend, false);
-	inode->i_ctime = inode->i_mtime = current_time(inode);
+	inode->i_mtime = inode_set_ctime_current(inode);
 	inode_inc_iversion(inode);
 }
 EXPORT_SYMBOL_GPL(shmem_truncate_range);
@@ -1161,9 +1161,9 @@  static int shmem_setattr(struct mnt_idmap *idmap,
 	if (attr->ia_valid & ATTR_MODE)
 		error = posix_acl_chmod(idmap, dentry, inode->i_mode);
 	if (!error && update_ctime) {
-		inode->i_ctime = current_time(inode);
+		inode_set_ctime_current(inode);
 		if (update_mtime)
-			inode->i_mtime = inode->i_ctime;
+			inode->i_mtime = inode_get_ctime(inode);
 		inode_inc_iversion(inode);
 	}
 	return error;
@@ -2394,7 +2394,7 @@  static struct inode *shmem_get_inode(struct mnt_idmap *idmap, struct super_block
 		inode->i_ino = ino;
 		inode_init_owner(idmap, inode, dir, mode);
 		inode->i_blocks = 0;
-		inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+		inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
 		inode->i_generation = get_random_u32();
 		info = SHMEM_I(inode);
 		memset(info, 0, (char *)inode - (char *)info);
@@ -3110,7 +3110,7 @@  shmem_mknod(struct mnt_idmap *idmap, struct inode *dir,
 			goto out_iput;
 
 		dir->i_size += BOGO_DIRENT_SIZE;
-		dir->i_ctime = dir->i_mtime = current_time(dir);
+		dir->i_mtime = inode_set_ctime_current(dir);
 		inode_inc_iversion(dir);
 		d_instantiate(dentry, inode);
 		dget(dentry); /* Extra count - pin the dentry in core */
@@ -3193,7 +3193,8 @@  static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr
 	}
 
 	dir->i_size += BOGO_DIRENT_SIZE;
-	inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode);
+	dir->i_mtime = inode_set_ctime_to_ts(dir,
+					     inode_set_ctime_current(inode));
 	inode_inc_iversion(dir);
 	inc_nlink(inode);
 	ihold(inode);	/* New dentry reference */
@@ -3213,7 +3214,8 @@  static int shmem_unlink(struct inode *dir, struct dentry *dentry)
 	simple_offset_remove(shmem_get_offset_ctx(dir), dentry);
 
 	dir->i_size -= BOGO_DIRENT_SIZE;
-	inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode);
+	dir->i_mtime = inode_set_ctime_to_ts(dir,
+					     inode_set_ctime_current(inode));
 	inode_inc_iversion(dir);
 	drop_nlink(inode);
 	dput(dentry);	/* Undo the count from "create" - this does all the work */
@@ -3360,7 +3362,7 @@  static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir,
 		folio_put(folio);
 	}
 	dir->i_size += BOGO_DIRENT_SIZE;
-	dir->i_ctime = dir->i_mtime = current_time(dir);
+	dir->i_mtime = inode_set_ctime_current(dir);
 	inode_inc_iversion(dir);
 	d_instantiate(dentry, inode);
 	dget(dentry);
@@ -3438,7 +3440,7 @@  static int shmem_fileattr_set(struct mnt_idmap *idmap,
 		(fa->flags & SHMEM_FL_USER_MODIFIABLE);
 
 	shmem_set_inode_flags(inode, info->fsflags);
-	inode->i_ctime = current_time(inode);
+	inode_set_ctime_current(inode);
 	inode_inc_iversion(inode);
 	return 0;
 }
@@ -3508,7 +3510,7 @@  static int shmem_xattr_handler_set(const struct xattr_handler *handler,
 	name = xattr_full_name(handler, name);
 	err = simple_xattr_set(&info->xattrs, name, value, size, flags, NULL);
 	if (!err) {
-		inode->i_ctime = current_time(inode);
+		inode_set_ctime_current(inode);
 		inode_inc_iversion(inode);
 	}
 	return err;