[v2,41/89] hfs: convert to new timestamp accessors

Message ID	20231004185347.80880-39-jlayton@kernel.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-fsdevel-owner@vger.kernel.org> From: Jeff Layton <jlayton@kernel.org> To: Alexander Viro <viro@zeniv.linux.org.uk>, Christian Brauner <brauner@kernel.org>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 41/89] hfs: convert to new timestamp accessors Date: Wed, 4 Oct 2023 14:52:26 -0400 Message-ID: <20231004185347.80880-39-jlayton@kernel.org> In-Reply-To: <20231004185347.80880-1-jlayton@kernel.org> References: <20231004185221.80802-1-jlayton@kernel.org> <20231004185347.80880-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	fs: new accessor methods for inode atime and mtime \| expand [v2,00/89] fs: new accessor methods for inode atime and mtime [v2,03/89] spufs: convert to new timestamp accessors [v2,04/89] hypfs: convert to new timestamp accessors [v2,05/89] android: convert to new timestamp accessors [v2,06/89] char: convert to new timestamp accessors [v2,07/89] qib: convert to new timestamp accessors [v2,08/89] ibmasm: convert to new timestamp accessors [v2,09/89] misc: convert to new timestamp accessors [v2,10/89] x86: convert to new timestamp accessors [v2,11/89] tty: convert to new timestamp accessors [v2,12/89] function: convert to new timestamp accessors [v2,13/89] legacy: convert to new timestamp accessors [v2,14/89] usb: convert to new timestamp accessors [v2,15/89] 9p: convert to new timestamp accessors [v2,16/89] adfs: convert to new timestamp accessors [v2,17/89] affs: convert to new timestamp accessors [v2,18/89] afs: convert to new timestamp accessors [v2,19/89] autofs: convert to new timestamp accessors [v2,20/89] bcachefs: convert to new timestamp accessors [v2,21/89] befs: convert to new timestamp accessors [v2,22/89] bfs: convert to new timestamp accessors [v2,23/89] btrfs: convert to new timestamp accessors [v2,24/89] ceph: convert to new timestamp accessors [v2,25/89] coda: convert to new timestamp accessors [v2,26/89] configfs: convert to new timestamp accessors [v2,27/89] cramfs: convert to new timestamp accessors [v2,28/89] debugfs: convert to new timestamp accessors [v2,29/89] devpts: convert to new timestamp accessors [v2,30/89] efivarfs: convert to new timestamp accessors [v2,31/89] efs: convert to new timestamp accessors [v2,32/89] erofs: convert to new timestamp accessors [v2,33/89] exfat: convert to new timestamp accessors [v2,34/89] ext2: convert to new timestamp accessors [v2,35/89] ext4: convert to new timestamp accessors [v2,36/89] f2fs: convert to new timestamp accessors [v2,37/89] fat: convert to new timestamp accessors [v2,38/89] freevxfs: convert to new timestamp accessors [v2,39/89] fuse: convert to new timestamp accessors [v2,40/89] gfs2: convert to new timestamp accessors [v2,41/89] hfs: convert to new timestamp accessors [v2,42/89] hfsplus: convert to new timestamp accessors [v2,43/89] hostfs: convert to new timestamp accessors [v2,44/89] hpfs: convert to new timestamp accessors [v2,45/89] hugetlbfs: convert to new timestamp accessors [v2,46/89] isofs: convert to new timestamp accessors [v2,47/89] jffs2: convert to new timestamp accessors [v2,48/89] jfs: convert to new timestamp accessors [v2,49/89] kernfs: convert to new timestamp accessors [v2,50/89] minix: convert to new timestamp accessors [v2,51/89] nfs: convert to new timestamp accessors [v2,52/89] nfsd: convert to new timestamp accessors [v2,01/89] fs: new accessor methods for atime and mtime [v2,02/89] fs: convert core infrastructure to new timestamp accessors [v2,53/89] nilfs2: convert to new timestamp accessors [v2,54/89] ntfs: convert to new timestamp accessors [v2,55/89] ntfs3: convert to new timestamp accessors [v2,56/89] ocfs2: convert to new timestamp accessors [v2,57/89] omfs: convert to new timestamp accessors [v2,58/89] openpromfs: convert to new timestamp accessors [v2,59/89] orangefs: convert to new timestamp accessors [v2,60/89] overlayfs: convert to new timestamp accessors [v2,61/89] proc: convert to new timestamp accessors [v2,62/89] pstore: convert to new timestamp accessors [v2,63/89] qnx4: convert to new timestamp accessors [v2,64/89] qnx6: convert to new timestamp accessors [v2,65/89] ramfs: convert to new timestamp accessors [v2,66/89] reiserfs: convert to new timestamp accessors [v2,67/89] romfs: convert to new timestamp accessors [v2,68/89] client: convert to new timestamp accessors [v2,69/89] server: convert to new timestamp accessors [v2,70/89] squashfs: convert to new timestamp accessors [v2,71/89] sysv: convert to new timestamp accessors [v2,72/89] tracefs: convert to new timestamp accessors [v2,73/89] ubifs: convert to new timestamp accessors [v2,74/89] udf: convert to new timestamp accessors [v2,75/89] ufs: convert to new timestamp accessors [v2,76/89] vboxsf: convert to new timestamp accessors [v2,77/89] xfs: convert to new timestamp accessors [v2,78/89] zonefs: convert to new timestamp accessors [v2,79/89] linux: convert to new timestamp accessors [v2,80/89] ipc: convert to new timestamp accessors [v2,81/89] bpf: convert to new timestamp accessors [v2,82/89] mm: convert to new timestamp accessors [v2,83/89] sunrpc: convert to new timestamp accessors [v2,84/89] apparmor: convert to new timestamp accessors [v2,85/89] selinux: convert to new timestamp accessors [v2,86/89] security: convert to new timestamp accessors [v2,87/89] fs: rename inode i_atime and i_mtime fields [v2,88/89] fs: switch timespec64 fields in inode to discrete integers [v2,89/89] fs: move i_generation into new hole created after timestamp conversion

Message ID

20231004185347.80880-39-jlayton@kernel.org (mailing list archive)

State

New, archived

Headers

From: Jeff Layton <jlayton@kernel.org>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
        Christian Brauner <brauner@kernel.org>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 41/89] hfs: convert to new timestamp accessors
Date: Wed,  4 Oct 2023 14:52:26 -0400
Message-ID: <20231004185347.80880-39-jlayton@kernel.org>
In-Reply-To: <20231004185347.80880-1-jlayton@kernel.org>
References: <20231004185221.80802-1-jlayton@kernel.org>
 <20231004185347.80880-1-jlayton@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

fs: new accessor methods for inode atime and mtime | expand

Commit Message

Jeff Layton Oct. 4, 2023, 6:52 p.m. UTC

Convert to using the new inode timestamp accessor functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/hfs/catalog.c |  8 ++++----
 fs/hfs/inode.c   | 16 ++++++++--------
 fs/hfs/sysdep.c  | 10 ++++++----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
index 632c226a3972..d63880e7d9d6 100644
--- a/fs/hfs/catalog.c
+++ b/fs/hfs/catalog.c
@@ -133,7 +133,7 @@  int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct i
 		goto err1;
 
 	dir->i_size++;
-	dir->i_mtime = inode_set_ctime_current(dir);
+	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
 	mark_inode_dirty(dir);
 	hfs_find_exit(&fd);
 	return 0;
@@ -269,7 +269,7 @@  int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)
 	}
 
 	dir->i_size--;
-	dir->i_mtime = inode_set_ctime_current(dir);
+	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
 	mark_inode_dirty(dir);
 	res = 0;
 out:
@@ -337,7 +337,7 @@  int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
 	if (err)
 		goto out;
 	dst_dir->i_size++;
-	dst_dir->i_mtime = inode_set_ctime_current(dst_dir);
+	inode_set_mtime_to_ts(dst_dir, inode_set_ctime_current(dst_dir));
 	mark_inode_dirty(dst_dir);
 
 	/* finally remove the old entry */
@@ -349,7 +349,7 @@  int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
 	if (err)
 		goto out;
 	src_dir->i_size--;
-	src_dir->i_mtime = inode_set_ctime_current(src_dir);
+	inode_set_mtime_to_ts(src_dir, inode_set_ctime_current(src_dir));
 	mark_inode_dirty(src_dir);
 
 	type = entry.type;
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index ee349b72cfb3..a7bc4690a780 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -200,7 +200,7 @@  struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t
 	inode->i_uid = current_fsuid();
 	inode->i_gid = current_fsgid();
 	set_nlink(inode, 1);
-	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+	simple_inode_init_ts(inode);
 	HFS_I(inode)->flags = 0;
 	HFS_I(inode)->rsrc_inode = NULL;
 	HFS_I(inode)->fs_blocks = 0;
@@ -355,8 +355,8 @@  static int hfs_read_inode(struct inode *inode, void *data)
 			inode->i_mode |= S_IWUGO;
 		inode->i_mode &= ~hsb->s_file_umask;
 		inode->i_mode |= S_IFREG;
-		inode->i_atime = inode->i_mtime = inode_set_ctime_to_ts(inode,
-									hfs_m_to_utime(rec->file.MdDat));
+		inode_set_mtime_to_ts(inode,
+				      inode_set_atime_to_ts(inode, inode_set_ctime_to_ts(inode, hfs_m_to_utime(rec->file.MdDat))));
 		inode->i_op = &hfs_file_inode_operations;
 		inode->i_fop = &hfs_file_operations;
 		inode->i_mapping->a_ops = &hfs_aops;
@@ -366,8 +366,8 @@  static int hfs_read_inode(struct inode *inode, void *data)
 		inode->i_size = be16_to_cpu(rec->dir.Val) + 2;
 		HFS_I(inode)->fs_blocks = 0;
 		inode->i_mode = S_IFDIR | (S_IRWXUGO & ~hsb->s_dir_umask);
-		inode->i_atime = inode->i_mtime = inode_set_ctime_to_ts(inode,
-									hfs_m_to_utime(rec->dir.MdDat));
+		inode_set_mtime_to_ts(inode,
+				      inode_set_atime_to_ts(inode, inode_set_ctime_to_ts(inode, hfs_m_to_utime(rec->dir.MdDat))));
 		inode->i_op = &hfs_dir_inode_operations;
 		inode->i_fop = &hfs_dir_operations;
 		break;
@@ -474,7 +474,7 @@  int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)
 		    be32_to_cpu(rec.dir.DirID) != inode->i_ino) {
 		}
 
-		rec.dir.MdDat = hfs_u_to_mtime(inode->i_mtime);
+		rec.dir.MdDat = hfs_u_to_mtime(inode_get_mtime(inode));
 		rec.dir.Val = cpu_to_be16(inode->i_size - 2);
 
 		hfs_bnode_write(fd.bnode, &rec, fd.entryoffset,
@@ -502,7 +502,7 @@  int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)
 		else
 			rec.file.Flags |= HFS_FIL_LOCK;
 		hfs_inode_write_fork(inode, rec.file.ExtRec, &rec.file.LgLen, &rec.file.PyLen);
-		rec.file.MdDat = hfs_u_to_mtime(inode->i_mtime);
+		rec.file.MdDat = hfs_u_to_mtime(inode_get_mtime(inode));
 
 		hfs_bnode_write(fd.bnode, &rec, fd.entryoffset,
 			    sizeof(struct hfs_cat_file));
@@ -654,7 +654,7 @@  int hfs_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
 
 		truncate_setsize(inode, attr->ia_size);
 		hfs_file_truncate(inode);
-		inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+		simple_inode_init_ts(inode);
 	}
 
 	setattr_copy(&nop_mnt_idmap, inode, attr);
diff --git a/fs/hfs/sysdep.c b/fs/hfs/sysdep.c
index dc27d418fbcd..76fa02e3835b 100644
--- a/fs/hfs/sysdep.c
+++ b/fs/hfs/sysdep.c
@@ -28,11 +28,13 @@  static int hfs_revalidate_dentry(struct dentry *dentry, unsigned int flags)
 	/* fix up inode on a timezone change */
 	diff = sys_tz.tz_minuteswest * 60 - HFS_I(inode)->tz_secondswest;
 	if (diff) {
-		struct timespec64 ctime = inode_get_ctime(inode);
+		struct timespec64 ts = inode_get_ctime(inode);
 
-		inode_set_ctime(inode, ctime.tv_sec + diff, ctime.tv_nsec);
-		inode->i_atime.tv_sec += diff;
-		inode->i_mtime.tv_sec += diff;
+		inode_set_ctime(inode, ts.tv_sec + diff, ts.tv_nsec);
+		ts = inode_get_atime(inode);
+		inode_set_atime(inode, ts.tv_sec + diff, ts.tv_nsec);
+		ts = inode_get_mtime(inode);
+		inode_set_mtime(inode, ts.tv_sec + diff, ts.tv_nsec);
 		HFS_I(inode)->tz_secondswest += diff;
 	}
 	return 1;

[v2,41/89] hfs: convert to new timestamp accessors

Commit Message

Patch