diff mbox series

[38/79] hpfs: switch to new ctime accessors

Message ID	20230621144735.55953-37-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>, Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz> Cc: Al Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>, linux-kernel@vger.kernel.org Subject: [PATCH 38/79] hpfs: switch to new ctime accessors Date: Wed, 21 Jun 2023 10:45:51 -0400 Message-ID: <20230621144735.55953-37-jlayton@kernel.org> In-Reply-To: <20230621144735.55953-1-jlayton@kernel.org> References: <20230621144507.55591-1-jlayton@kernel.org> <20230621144735.55953-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| [02/79] spufs: switch to new ctime accessors [03/79] s390: switch to new ctime accessors [04/79] binderfs: switch to new ctime accessors [05/79] qib_fs: switch to new ctime accessors [06/79] ibm: switch to new ctime accessors [07/79] usb: switch to new ctime accessors [08/79] 9p: switch to new ctime accessors [09/79] adfs: switch to new ctime accessors [10/79] affs: switch to new ctime accessors [11/79] afs: switch to new ctime accessors [12/79] fs: switch to new ctime accessors [13/79] autofs: switch to new ctime accessors [14/79] befs: switch to new ctime accessors [15/79] bfs: switch to new ctime accessors [16/79] btrfs: switch to new ctime accessors [17/79] ceph: switch to new ctime accessors [18/79] coda: switch to new ctime accessors [19/79] configfs: switch to new ctime accessors [20/79] cramfs: switch to new ctime accessors [21/79] debugfs: switch to new ctime accessors [22/79] devpts: switch to new ctime accessors [23/79] ecryptfs: switch to new ctime accessors [24/79] efivarfs: switch to new ctime accessors [25/79] efs: switch to new ctime accessors [26/79] erofs: switch to new ctime accessors [27/79] exfat: switch to new ctime accessors [28/79] ext2: switch to new ctime accessors [29/79] ext4: switch to new ctime accessors [30/79] f2fs: switch to new ctime accessors [31/79] fat: switch to new ctime accessors [32/79] freevxfs: switch to new ctime accessors [33/79] fuse: switch to new ctime accessors [34/79] gfs2: switch to new ctime accessors [35/79] hfs: switch to new ctime accessors [36/79] hfsplus: switch to new ctime accessors [37/79] hostfs: switch to new ctime accessors [38/79] hpfs: switch to new ctime accessors [39/79] hugetlbfs: switch to new ctime accessors [40/79] isofs: switch to new ctime accessors [41/79] jffs2: switch to new ctime accessors [42/79] jfs: switch to new ctime accessors [43/79] kernfs: switch to new ctime accessors [44/79] minix: switch to new ctime accessors [45/79] nfs: switch to new ctime accessors [46/79] nfsd: switch to new ctime accessors [47/79] nilfs2: switch to new ctime accessors [48/79] ntfs: switch to new ctime accessors [49/79] ntfs3: switch to new ctime accessors [50/79] ocfs2: switch to new ctime accessors [51/79] omfs: switch to new ctime accessors [52/79] openpromfs: switch to new ctime accessors [53/79] orangefs: switch to new ctime accessors [54/79] overlayfs: switch to new ctime accessors [55/79] proc: switch to new ctime accessors [56/79] pstore: switch to new ctime accessors [57/79] qnx4: switch to new ctime accessors [58/79] qnx6: switch to new ctime accessors [59/79] ramfs: switch to new ctime accessors [60/79] reiserfs: switch to new ctime accessors [61/79] romfs: switch to new ctime accessors [62/79] smb: switch to new ctime accessors [63/79] squashfs: switch to new ctime accessors [64/79] sysv: switch to new ctime accessors [65/79] tracefs: switch to new ctime accessors [66/79] ubifs: switch to new ctime accessors [67/79] udf: switch to new ctime accessors [68/79] ufs: switch to new ctime accessors [69/79] vboxsf: switch to new ctime accessors [70/79] xfs: switch to new ctime accessors [71/79] zonefs: switch to new ctime accessors [72/79] mqueue: switch to new ctime accessors [73/79] bpf: switch to new ctime accessors [74/79] shmem: switch to new ctime accessors [75/79] rpc_pipefs: switch to new ctime accessors [76/79] apparmor: switch to new ctime accessors [77/79] security: switch to new ctime accessors [78/79] selinux: switch to new ctime accessors

Commit Message

Jeff Layton June 21, 2023, 2:45 p.m. UTC

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

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/hpfs/dir.c   |  8 ++++----
 fs/hpfs/inode.c |  6 +++---
 fs/hpfs/namei.c | 26 +++++++++++++++-----------
 fs/hpfs/super.c |  5 +++--
 4 files changed, 25 insertions(+), 20 deletions(-)

diff mbox series

Patch

diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c
index f32f15669996..fe808e6a3962 100644
--- a/fs/hpfs/dir.c
+++ b/fs/hpfs/dir.c
@@ -277,10 +277,10 @@  struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, unsigned in
 	 * inode.
 	 */
 
-	if (!result->i_ctime.tv_sec) {
-		if (!(result->i_ctime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(de->creation_date))))
-			result->i_ctime.tv_sec = 1;
-		result->i_ctime.tv_nsec = 0;
+	if (!inode_ctime_peek(result).tv_sec) {
+		if (!(inode_ctime_set_sec(result, local_to_gmt(dir->i_sb, le32_to_cpu(de->creation_date)))))
+			inode_ctime_set_sec(result, 1);
+		inode_ctime_set_nsec(result, 0);
 		result->i_mtime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(de->write_date));
 		result->i_mtime.tv_nsec = 0;
 		result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(de->read_date));
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index e50e92a42432..48e71035d88c 100644
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -36,7 +36,7 @@  void hpfs_init_inode(struct inode *i)
 	hpfs_inode->i_rddir_off = NULL;
 	hpfs_inode->i_dirty = 0;
 
-	i->i_ctime.tv_sec = i->i_ctime.tv_nsec = 0;
+	inode_ctime_set_sec(i, inode_ctime_set_nsec(i, 0));
 	i->i_mtime.tv_sec = i->i_mtime.tv_nsec = 0;
 	i->i_atime.tv_sec = i->i_atime.tv_nsec = 0;
 }
@@ -232,7 +232,7 @@  void hpfs_write_inode_nolock(struct inode *i)
 	if (de) {
 		de->write_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_mtime.tv_sec));
 		de->read_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_atime.tv_sec));
-		de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_ctime.tv_sec));
+		de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_ctime_peek(i).tv_sec));
 		de->read_only = !(i->i_mode & 0222);
 		de->ea_size = cpu_to_le32(hpfs_inode->i_ea_size);
 		hpfs_mark_4buffers_dirty(&qbh);
@@ -242,7 +242,7 @@  void hpfs_write_inode_nolock(struct inode *i)
 		if ((de = map_dirent(i, hpfs_inode->i_dno, "\001\001", 2, NULL, &qbh))) {
 			de->write_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_mtime.tv_sec));
 			de->read_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_atime.tv_sec));
-			de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, i->i_ctime.tv_sec));
+			de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_ctime_peek(i).tv_sec));
 			de->read_only = !(i->i_mode & 0222);
 			de->ea_size = cpu_to_le32(/*hpfs_inode->i_ea_size*/0);
 			de->file_size = cpu_to_le32(0);
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index 69fb40b2c99a..c065ef3fec52 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -13,10 +13,10 @@  static void hpfs_update_directory_times(struct inode *dir)
 {
 	time64_t t = local_to_gmt(dir->i_sb, local_get_seconds(dir->i_sb));
 	if (t == dir->i_mtime.tv_sec &&
-	    t == dir->i_ctime.tv_sec)
+	    t == inode_ctime_peek(dir).tv_sec)
 		return;
-	dir->i_mtime.tv_sec = dir->i_ctime.tv_sec = t;
-	dir->i_mtime.tv_nsec = dir->i_ctime.tv_nsec = 0;
+	dir->i_mtime.tv_sec = inode_ctime_set_sec(dir, t);
+	dir->i_mtime.tv_nsec = inode_ctime_set_nsec(dir, 0);
 	hpfs_write_inode_nolock(dir);
 }
 
@@ -59,8 +59,9 @@  static int hpfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,
 	result->i_ino = fno;
 	hpfs_i(result)->i_parent_dir = dir->i_ino;
 	hpfs_i(result)->i_dno = dno;
-	result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
-	result->i_ctime.tv_nsec = 0; 
+	inode_ctime_set_sec(result,
+			    result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)));
+	inode_ctime_set_nsec(result, 0); 
 	result->i_mtime.tv_nsec = 0; 
 	result->i_atime.tv_nsec = 0; 
 	hpfs_i(result)->i_ea_size = 0;
@@ -167,8 +168,9 @@  static int hpfs_create(struct mnt_idmap *idmap, struct inode *dir,
 	result->i_fop = &hpfs_file_ops;
 	set_nlink(result, 1);
 	hpfs_i(result)->i_parent_dir = dir->i_ino;
-	result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
-	result->i_ctime.tv_nsec = 0;
+	inode_ctime_set_sec(result,
+			    result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)));
+	inode_ctime_set_nsec(result, 0);
 	result->i_mtime.tv_nsec = 0;
 	result->i_atime.tv_nsec = 0;
 	hpfs_i(result)->i_ea_size = 0;
@@ -250,8 +252,9 @@  static int hpfs_mknod(struct mnt_idmap *idmap, struct inode *dir,
 	hpfs_init_inode(result);
 	result->i_ino = fno;
 	hpfs_i(result)->i_parent_dir = dir->i_ino;
-	result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
-	result->i_ctime.tv_nsec = 0;
+	inode_ctime_set_sec(result,
+			    result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)));
+	inode_ctime_set_nsec(result, 0);
 	result->i_mtime.tv_nsec = 0;
 	result->i_atime.tv_nsec = 0;
 	hpfs_i(result)->i_ea_size = 0;
@@ -326,8 +329,9 @@  static int hpfs_symlink(struct mnt_idmap *idmap, struct inode *dir,
 	result->i_ino = fno;
 	hpfs_init_inode(result);
 	hpfs_i(result)->i_parent_dir = dir->i_ino;
-	result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
-	result->i_ctime.tv_nsec = 0;
+	inode_ctime_set_sec(result,
+			    result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)));
+	inode_ctime_set_nsec(result, 0);
 	result->i_mtime.tv_nsec = 0;
 	result->i_atime.tv_nsec = 0;
 	hpfs_i(result)->i_ea_size = 0;
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 1cb89595b875..cc7602d5485e 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -729,8 +729,9 @@  static int hpfs_fill_super(struct super_block *s, void *options, int silent)
 		root->i_atime.tv_nsec = 0;
 		root->i_mtime.tv_sec = local_to_gmt(s, le32_to_cpu(de->write_date));
 		root->i_mtime.tv_nsec = 0;
-		root->i_ctime.tv_sec = local_to_gmt(s, le32_to_cpu(de->creation_date));
-		root->i_ctime.tv_nsec = 0;
+		inode_ctime_set_sec(root,
+				    local_to_gmt(s, le32_to_cpu(de->creation_date)));
+		inode_ctime_set_nsec(root, 0);
 		hpfs_i(root)->i_ea_size = le32_to_cpu(de->ea_size);
 		hpfs_i(root)->i_parent_dir = root->i_ino;
 		if (root->i_size == -1)