diff mbox series

[v2,56/92] kernfs: convert to ctime accessor functions

Message ID	20230705190309.579783-54-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>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Tejun Heo <tj@kernel.org>, Alexander Viro <viro@zeniv.linux.org.uk> Cc: Jan Kara <jack@suse.cz>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 56/92] kernfs: convert to ctime accessor functions Date: Wed, 5 Jul 2023 15:01:21 -0400 Message-ID: <20230705190309.579783-54-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.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/kernfs/inode.c       |  5 ++---
 fs/libfs.c              | 19 ++++++++++---------
 fs/minix/bitmap.c       |  2 +-
 fs/minix/dir.c          |  6 +++---
 fs/minix/inode.c        | 10 +++++-----
 fs/minix/itree_common.c |  4 ++--
 fs/minix/namei.c        |  6 +++---
 7 files changed, 26 insertions(+), 26 deletions(-)

Comments

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

On Wed 05-07-23 15:01:21, 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.
> 
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Jeff Layton <jlayton@kernel.org>

It looks like there are like three commits squashed into this patch -
kernfs, libfs, minix.

kernfs and libfs parts look good to me - feel free to add:

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

to them. For the minix part I have one nit:

> diff --git a/fs/minix/inode.c b/fs/minix/inode.c
> index e9fbb5303a22..3715a3940bd4 100644
> --- a/fs/minix/inode.c
> +++ b/fs/minix/inode.c
> @@ -501,10 +501,11 @@ static struct inode *V1_minix_iget(struct inode *inode)
>  	i_gid_write(inode, raw_inode->i_gid);
>  	set_nlink(inode, raw_inode->i_nlinks);
>  	inode->i_size = raw_inode->i_size;
> -	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = raw_inode->i_time;
> +	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
> +									raw_inode->i_time,
> +									0).tv_sec;
>  	inode->i_mtime.tv_nsec = 0;
>  	inode->i_atime.tv_nsec = 0;
> -	inode->i_ctime.tv_nsec = 0;

The usual simplification:
	inode->i_mtime = inode->i_atime = inode_set_ctime(inode,
							  raw_inode->i_time, 0);

								Honza

Jeff Layton July 6, 2023, 1:50 p.m. UTC | #2

On Thu, 2023-07-06 at 15:32 +0200, Jan Kara wrote:
> On Wed 05-07-23 15:01:21, 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.
> > 
> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Signed-off-by: Jeff Layton <jlayton@kernel.org>
> 
> It looks like there are like three commits squashed into this patch -
> kernfs, libfs, minix.
> 
> kernfs and libfs parts look good to me - feel free to add:
> 
> Reviewed-by: Jan Kara <jack@suse.cz>
> 
> to them. For the minix part I have one nit:
> 
> > diff --git a/fs/minix/inode.c b/fs/minix/inode.c
> > index e9fbb5303a22..3715a3940bd4 100644
> > --- a/fs/minix/inode.c
> > +++ b/fs/minix/inode.c
> > @@ -501,10 +501,11 @@ static struct inode *V1_minix_iget(struct inode *inode)
> >  	i_gid_write(inode, raw_inode->i_gid);
> >  	set_nlink(inode, raw_inode->i_nlinks);
> >  	inode->i_size = raw_inode->i_size;
> > -	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = raw_inode->i_time;
> > +	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
> > +									raw_inode->i_time,
> > +									0).tv_sec;
> >  	inode->i_mtime.tv_nsec = 0;
> >  	inode->i_atime.tv_nsec = 0;
> > -	inode->i_ctime.tv_nsec = 0;
> 
> The usual simplification:
> 	inode->i_mtime = inode->i_atime = inode_set_ctime(inode,
> 							  raw_inode->i_time, 0);
> 
> 								Honza


Thanks. I'm not sure what happened with this patch, as some of the
subsystems got squashed together. I'll break that up properly too.

diff mbox series

Patch

diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index b22b74d1a115..89a9b4dcf109 100644
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -151,8 +151,7 @@  ssize_t kernfs_iop_listxattr(struct dentry *dentry, char *buf, size_t size)
 static inline void set_default_inode_attr(struct inode *inode, umode_t mode)
 {
 	inode->i_mode = mode;
-	inode->i_atime = inode->i_mtime =
-		inode->i_ctime = current_time(inode);
+	inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
 }
 
 static inline void set_inode_attr(struct inode *inode,
@@ -162,7 +161,7 @@  static inline void set_inode_attr(struct inode *inode,
 	inode->i_gid = attrs->ia_gid;
 	inode->i_atime = attrs->ia_atime;
 	inode->i_mtime = attrs->ia_mtime;
-	inode->i_ctime = attrs->ia_ctime;
+	inode_set_ctime_to_ts(inode, attrs->ia_ctime);
 }
 
 static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode)
diff --git a/fs/libfs.c b/fs/libfs.c
index 9ee79668c909..befbef1b4b46 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -523,7 +523,7 @@  void simple_recursive_removal(struct dentry *dentry,
 		while ((child = find_next_child(this, victim)) == NULL) {
 			// kill and ascend
 			// update metadata while it's still locked
-			inode->i_ctime = current_time(inode);
+			inode_set_ctime_current(inode);
 			clear_nlink(inode);
 			inode_unlock(inode);
 			victim = this;
@@ -541,8 +541,7 @@  void simple_recursive_removal(struct dentry *dentry,
 				dput(victim);		// unpin it
 			}
 			if (victim == dentry) {
-				inode->i_ctime = inode->i_mtime =
-					current_time(inode);
+				inode->i_mtime = inode_set_ctime_current(inode);
 				if (d_is_dir(dentry))
 					drop_nlink(inode);
 				inode_unlock(inode);
@@ -583,7 +582,7 @@  static int pseudo_fs_fill_super(struct super_block *s, struct fs_context *fc)
 	 */
 	root->i_ino = 1;
 	root->i_mode = S_IFDIR | S_IRUSR | S_IWUSR;
-	root->i_atime = root->i_mtime = root->i_ctime = current_time(root);
+	root->i_atime = root->i_mtime = inode_set_ctime_current(root);
 	s->s_root = d_make_root(root);
 	if (!s->s_root)
 		return -ENOMEM;
@@ -639,7 +638,8 @@  int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *den
 {
 	struct inode *inode = d_inode(old_dentry);
 
-	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));
 	inc_nlink(inode);
 	ihold(inode);
 	dget(dentry);
@@ -673,7 +673,8 @@  int simple_unlink(struct inode *dir, struct dentry *dentry)
 {
 	struct inode *inode = d_inode(dentry);
 
-	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));
 	drop_nlink(inode);
 	dput(dentry);
 	return 0;
@@ -925,7 +926,7 @@  int simple_fill_super(struct super_block *s, unsigned long magic,
 	 */
 	inode->i_ino = 1;
 	inode->i_mode = S_IFDIR | 0755;
-	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_op = &simple_dir_inode_operations;
 	inode->i_fop = &simple_dir_operations;
 	set_nlink(inode, 2);
@@ -951,7 +952,7 @@  int simple_fill_super(struct super_block *s, unsigned long magic,
 			goto out;
 		}
 		inode->i_mode = S_IFREG | files->mode;
-		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_fop = files->ops;
 		inode->i_ino = i;
 		d_add(dentry, inode);
@@ -1519,7 +1520,7 @@  struct inode *alloc_anon_inode(struct super_block *s)
 	inode->i_uid = current_fsuid();
 	inode->i_gid = current_fsgid();
 	inode->i_flags |= S_PRIVATE;
-	inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+	inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
 	return inode;
 }
 EXPORT_SYMBOL(alloc_anon_inode);
diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index 870207ba23f1..25c08fbfcb9d 100644
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -251,7 +251,7 @@  struct inode *minix_new_inode(const struct inode *dir, umode_t mode)
 	}
 	inode_init_owner(&nop_mnt_idmap, inode, dir, mode);
 	inode->i_ino = j;
-	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
 	inode->i_blocks = 0;
 	memset(&minix_i(inode)->u, 0, sizeof(minix_i(inode)->u));
 	insert_inode_hash(inode);
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index bf9858f76b6a..20f23e6e58ad 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -281,7 +281,7 @@  int minix_add_link(struct dentry *dentry, struct inode *inode)
 		de->inode = inode->i_ino;
 	}
 	dir_commit_chunk(page, pos, sbi->s_dirsize);
-	dir->i_mtime = dir->i_ctime = current_time(dir);
+	dir->i_mtime = inode_set_ctime_current(dir);
 	mark_inode_dirty(dir);
 	err = minix_handle_dirsync(dir);
 out_put:
@@ -313,7 +313,7 @@  int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
 	else
 		de->inode = 0;
 	dir_commit_chunk(page, pos, len);
-	inode->i_ctime = inode->i_mtime = current_time(inode);
+	inode->i_mtime = inode_set_ctime_current(inode);
 	mark_inode_dirty(inode);
 	return minix_handle_dirsync(inode);
 }
@@ -436,7 +436,7 @@  int minix_set_link(struct minix_dir_entry *de, struct page *page,
 	else
 		de->inode = inode->i_ino;
 	dir_commit_chunk(page, pos, sbi->s_dirsize);
-	dir->i_mtime = dir->i_ctime = current_time(dir);
+	dir->i_mtime = inode_set_ctime_current(dir);
 	mark_inode_dirty(dir);
 	return minix_handle_dirsync(dir);
 }
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index e9fbb5303a22..3715a3940bd4 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -501,10 +501,11 @@  static struct inode *V1_minix_iget(struct inode *inode)
 	i_gid_write(inode, raw_inode->i_gid);
 	set_nlink(inode, raw_inode->i_nlinks);
 	inode->i_size = raw_inode->i_size;
-	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = raw_inode->i_time;
+	inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
+									raw_inode->i_time,
+									0).tv_sec;
 	inode->i_mtime.tv_nsec = 0;
 	inode->i_atime.tv_nsec = 0;
-	inode->i_ctime.tv_nsec = 0;
 	inode->i_blocks = 0;
 	for (i = 0; i < 9; i++)
 		minix_inode->u.i1_data[i] = raw_inode->i_zone[i];
@@ -543,10 +544,9 @@  static struct inode *V2_minix_iget(struct inode *inode)
 	inode->i_size = raw_inode->i_size;
 	inode->i_mtime.tv_sec = raw_inode->i_mtime;
 	inode->i_atime.tv_sec = raw_inode->i_atime;
-	inode->i_ctime.tv_sec = raw_inode->i_ctime;
+	inode_set_ctime(inode, raw_inode->i_ctime, 0);
 	inode->i_mtime.tv_nsec = 0;
 	inode->i_atime.tv_nsec = 0;
-	inode->i_ctime.tv_nsec = 0;
 	inode->i_blocks = 0;
 	for (i = 0; i < 10; i++)
 		minix_inode->u.i2_data[i] = raw_inode->i_zone[i];
@@ -622,7 +622,7 @@  static struct buffer_head * V2_minix_update_inode(struct inode * inode)
 	raw_inode->i_size = inode->i_size;
 	raw_inode->i_mtime = inode->i_mtime.tv_sec;
 	raw_inode->i_atime = inode->i_atime.tv_sec;
-	raw_inode->i_ctime = inode->i_ctime.tv_sec;
+	raw_inode->i_ctime = inode_get_ctime(inode).tv_sec;
 	if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
 		raw_inode->i_zone[0] = old_encode_dev(inode->i_rdev);
 	else for (i = 0; i < 10; i++)
diff --git a/fs/minix/itree_common.c b/fs/minix/itree_common.c
index 446148792f41..ce18ae37c29d 100644
--- a/fs/minix/itree_common.c
+++ b/fs/minix/itree_common.c
@@ -131,7 +131,7 @@  static inline int splice_branch(struct inode *inode,
 
 	/* We are done with atomic stuff, now do the rest of housekeeping */
 
-	inode->i_ctime = current_time(inode);
+	inode_set_ctime_current(inode);
 
 	/* had we spliced it onto indirect block? */
 	if (where->bh)
@@ -350,7 +350,7 @@  static inline void truncate (struct inode * inode)
 		}
 		first_whole++;
 	}
-	inode->i_mtime = inode->i_ctime = current_time(inode);
+	inode->i_mtime = inode_set_ctime_current(inode);
 	mark_inode_dirty(inode);
 }
 
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 956d5183828d..114084d5636a 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -98,7 +98,7 @@  static int minix_link(struct dentry * old_dentry, struct inode * dir,
 {
 	struct inode *inode = d_inode(old_dentry);
 
-	inode->i_ctime = current_time(inode);
+	inode_set_ctime_current(inode);
 	inode_inc_link_count(inode);
 	ihold(inode);
 	return add_nondir(dentry, inode);
@@ -154,7 +154,7 @@  static int minix_unlink(struct inode * dir, struct dentry *dentry)
 
 	if (err)
 		return err;
-	inode->i_ctime = dir->i_ctime;
+	inode_set_ctime_to_ts(inode, inode_get_ctime(dir));
 	inode_dec_link_count(inode);
 	return 0;
 }
@@ -218,7 +218,7 @@  static int minix_rename(struct mnt_idmap *idmap,
 		put_page(new_page);
 		if (err)
 			goto out_dir;
-		new_inode->i_ctime = current_time(new_inode);
+		inode_set_ctime_current(new_inode);
 		if (dir_de)
 			drop_nlink(new_inode);
 		inode_dec_link_count(new_inode);