[43/87] fs/hpfs: convert to new inode {a,m}time accessors

Message ID	20230928110413.33032-42-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 43/87] fs/hpfs: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:02:52 -0400 Message-ID: <20230928110413.33032-42-jlayton@kernel.org> In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org> References: <20230928110300.32891-1-jlayton@kernel.org> <20230928110413.33032-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	fs: new accessor methods for atime and mtime \| expand [00/87] fs: new accessor methods for atime and mtime [02/87] fs: convert core infrastructure to new {a,m}time accessors [03/87] arch/powerpc/platforms/cell/spufs: convert to new inode {a,m}time accessors [04/87] arch/s390/hypfs: convert to new inode {a,m}time accessors [05/87] drivers/android: convert to new inode {a,m}time accessors [06/87] drivers/char: convert to new inode {a,m}time accessors [07/87] drivers/infiniband/hw/qib: convert to new inode {a,m}time accessors [08/87] drivers/misc/ibmasm: convert to new inode {a,m}time accessors [09/87] drivers/misc: convert to new inode {a,m}time accessors [10/87] drivers/platform/x86: convert to new inode {a,m}time accessors [11/87] drivers/tty: convert to new inode {a,m}time accessors [12/87] drivers/usb/core: convert to new inode {a,m}time accessors [13/87] drivers/usb/gadget/function: convert to new inode {a,m}time accessors [14/87] drivers/usb/gadget/legacy: convert to new inode {a,m}time accessors [15/87] fs/9p: convert to new inode {a,m}time accessors [16/87] fs/adfs: convert to new inode {a,m}time accessors [17/87] fs/affs: convert to new inode {a,m}time accessors [18/87] fs/afs: convert to new inode {a,m}time accessors [19/87] fs/autofs: convert to new inode {a,m}time accessors [20/87] fs/befs: convert to new inode {a,m}time accessors [21/87] fs/bfs: convert to new inode {a,m}time accessors [22/87] fs/btrfs: convert to new inode {a,m}time accessors [23/87] fs/ceph: convert to new inode {a,m}time accessors [24/87] fs/coda: convert to new inode {a,m}time accessors [25/87] fs/configfs: convert to new inode {a,m}time accessors [26/87] fs/cramfs: convert to new inode {a,m}time accessors [27/87] fs/debugfs: convert to new inode {a,m}time accessors [28/87] fs/devpts: convert to new inode {a,m}time accessors [29/87] fs/efivarfs: convert to new inode {a,m}time accessors [30/87] fs/efs: convert to new inode {a,m}time accessors [31/87] fs/erofs: convert to new inode {a,m}time accessors [32/87] fs/exfat: convert to new inode {a,m}time accessors [33/87] fs/ext2: convert to new inode {a,m}time accessors [34/87] fs/ext4: convert to new inode {a,m}time accessors [35/87] fs/f2fs: convert to new inode {a,m}time accessors [36/87] fs/fat: convert to new inode {a,m}time accessors [37/87] fs/freevxfs: convert to new inode {a,m}time accessors [38/87] fs/fuse: convert to new inode {a,m}time accessors [39/87] fs/gfs2: convert to new inode {a,m}time accessors [40/87] fs/hfs: convert to new inode {a,m}time accessors [41/87] fs/hfsplus: convert to new inode {a,m}time accessors [42/87] fs/hostfs: convert to new inode {a,m}time accessors [43/87] fs/hpfs: convert to new inode {a,m}time accessors [44/87] fs/hugetlbfs: convert to new inode {a,m}time accessors [45/87] fs/isofs: convert to new inode {a,m}time accessors [46/87] fs/jffs2: convert to new inode {a,m}time accessors [47/87] fs/jfs: convert to new inode {a,m}time accessors [48/87] fs/kernfs: convert to new inode {a,m}time accessors [49/87] fs/minix: convert to new inode {a,m}time accessors [50/87] fs/nfs: convert to new inode {a,m}time accessors [01/87] fs: new accessor methods for atime and mtime [51/87] fs/nfsd: convert to new inode {a,m}time accessors [52/87] fs/nilfs2: convert to new inode {a,m}time accessors [53/87] fs/ntfs: convert to new inode {a,m}time accessors [54/87] fs/ntfs3: convert to new inode {a,m}time accessors [55/87] fs/ocfs2: convert to new inode {a,m}time accessors [56/87] fs/omfs: convert to new inode {a,m}time accessors [57/87] fs/openpromfs: convert to new inode {a,m}time accessors [58/87] fs/orangefs: convert to new inode {a,m}time accessors [59/87] fs/overlayfs: convert to new inode {a,m}time accessors [60/87] fs/proc: convert to new inode {a,m}time accessors [61/87] fs/pstore: convert to new inode {a,m}time accessors [62/87] fs/qnx4: convert to new inode {a,m}time accessors [63/87] fs/qnx6: convert to new inode {a,m}time accessors [64/87] fs/ramfs: convert to new inode {a,m}time accessors [65/87] fs/reiserfs: convert to new inode {a,m}time accessors [66/87] fs/romfs: convert to new inode {a,m}time accessors [67/87] fs/smb/client: convert to new inode {a,m}time accessors [68/87] fs/smb/server: convert to new inode {a,m}time accessors [69/87] fs/squashfs: convert to new inode {a,m}time accessors [70/87] fs/sysv: convert to new inode {a,m}time accessors [71/87] fs/tracefs: convert to new inode {a,m}time accessors [72/87] fs/ubifs: convert to new inode {a,m}time accessors [73/87] fs/udf: convert to new inode {a,m}time accessors [74/87] fs/ufs: convert to new inode {a,m}time accessors [75/87] fs/vboxsf: convert to new inode {a,m}time accessors [76/87] fs/xfs: convert to new inode {a,m}time accessors [77/87] fs/zonefs: convert to new inode {a,m}time accessors [78/87] ipc: convert to new inode {a,m}time accessors [79/87] kernel/bpf: convert to new inode {a,m}time accessors [80/87] mm: convert to new inode {a,m}time accessors [81/87] net/sunrpc: convert to new inode {a,m}time accessors [82/87] security/apparmor: convert to new inode {a,m}time accessors [83/87] security/selinux: convert to new inode {a,m}time accessors [84/87] security: convert to new inode {a,m}time accessors [85/87] fs: rename i_atime and i_mtime fields to __i_atime and __i_mtime [86/87] fs: switch timespec64 fields in inode to discrete integers [87/87] fs: move i_blocks up a few places in struct inode

Message ID

20230928110413.33032-42-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 43/87] fs/hpfs: convert to new inode {a,m}time accessors
Date: Thu, 28 Sep 2023 07:02:52 -0400
Message-ID: <20230928110413.33032-42-jlayton@kernel.org>
In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org>
References: <20230928110300.32891-1-jlayton@kernel.org>
 <20230928110413.33032-1-jlayton@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

fs: new accessor methods for atime and mtime | expand

Commit Message

Jeff Layton Sept. 28, 2023, 11:02 a.m. UTC

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/hpfs/dir.c   | 10 ++++++----
 fs/hpfs/inode.c | 12 ++++++------
 fs/hpfs/namei.c | 20 ++++++++++----------
 fs/hpfs/super.c | 10 ++++++----
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c
index f36566d61215..bd6ca49742d2 100644
--- a/fs/hpfs/dir.c
+++ b/fs/hpfs/dir.c
@@ -281,10 +281,12 @@  struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, unsigned in
 		time64_t csec = local_to_gmt(dir->i_sb, le32_to_cpu(de->creation_date));
 
 		inode_set_ctime(result, csec ? csec : 1, 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));
-		result->i_atime.tv_nsec = 0;
+		inode_set_mtime(result,
+				local_to_gmt(dir->i_sb, le32_to_cpu(de->write_date)),
+				0);
+		inode_set_atime(result,
+				local_to_gmt(dir->i_sb, le32_to_cpu(de->read_date)),
+				0);
 		hpfs_result->i_ea_size = le32_to_cpu(de->ea_size);
 		if (!hpfs_result->i_ea_mode && de->read_only)
 			result->i_mode &= ~0222;
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 479166378bae..b04e2d3d15f7 100644
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -37,8 +37,8 @@  void hpfs_init_inode(struct inode *i)
 	hpfs_inode->i_dirty = 0;
 
 	inode_set_ctime(i, 0, 0);
-	i->i_mtime.tv_sec = i->i_mtime.tv_nsec = 0;
-	i->i_atime.tv_sec = i->i_atime.tv_nsec = 0;
+	inode_set_mtime(i, 0, 0);
+	inode_set_atime(i, 0, 0);
 }
 
 void hpfs_read_inode(struct inode *i)
@@ -230,8 +230,8 @@  void hpfs_write_inode_nolock(struct inode *i)
 	}
 	hpfs_write_inode_ea(i, fnode);
 	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->write_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_get_mtime(i).tv_sec));
+		de->read_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_get_atime(i).tv_sec));
 		de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_get_ctime(i).tv_sec));
 		de->read_only = !(i->i_mode & 0222);
 		de->ea_size = cpu_to_le32(hpfs_inode->i_ea_size);
@@ -240,8 +240,8 @@  void hpfs_write_inode_nolock(struct inode *i)
 	}
 	if (S_ISDIR(i->i_mode)) {
 		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->write_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_get_mtime(i).tv_sec));
+			de->read_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_get_atime(i).tv_sec));
 			de->creation_date = cpu_to_le32(gmt_to_local(i->i_sb, inode_get_ctime(i).tv_sec));
 			de->read_only = !(i->i_mode & 0222);
 			de->ea_size = cpu_to_le32(/*hpfs_inode->i_ea_size*/0);
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index f4eb8d6f5989..20f67da1cb20 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -12,10 +12,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 &&
+	if (t == inode_get_mtime(dir).tv_sec &&
 	    t == inode_get_ctime(dir).tv_sec)
 		return;
-	dir->i_mtime = inode_set_ctime(dir, t, 0);
+	inode_set_mtime_to_ts(dir, inode_set_ctime(dir, t, 0));
 	hpfs_write_inode_nolock(dir);
 }
 
@@ -58,8 +58,8 @@  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_mtime = result->i_atime =
-		inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0);
+	inode_set_mtime_to_ts(result,
+			      inode_set_atime_to_ts(result, inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0)));
 	hpfs_i(result)->i_ea_size = 0;
 	result->i_mode |= S_IFDIR;
 	result->i_op = &hpfs_dir_iops;
@@ -164,8 +164,8 @@  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_mtime = result->i_atime =
-		inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0);
+	inode_set_mtime_to_ts(result,
+			      inode_set_atime_to_ts(result, inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0)));
 	hpfs_i(result)->i_ea_size = 0;
 	if (dee.read_only)
 		result->i_mode &= ~0222;
@@ -245,8 +245,8 @@  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_mtime = result->i_atime =
-		inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0);
+	inode_set_mtime_to_ts(result,
+			      inode_set_atime_to_ts(result, inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0)));
 	hpfs_i(result)->i_ea_size = 0;
 	result->i_uid = current_fsuid();
 	result->i_gid = current_fsgid();
@@ -319,8 +319,8 @@  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_mtime = result->i_atime =
-		inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0);
+	inode_set_mtime_to_ts(result,
+			      inode_set_atime_to_ts(result, inode_set_ctime(result, local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date)), 0)));
 	hpfs_i(result)->i_ea_size = 0;
 	result->i_mode = S_IFLNK | 0777;
 	result->i_uid = current_fsuid();
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 758a51564124..6b0ba3c1efba 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -725,10 +725,12 @@  static int hpfs_fill_super(struct super_block *s, void *options, int silent)
 	if (!de)
 		hpfs_error(s, "unable to find root dir");
 	else {
-		root->i_atime.tv_sec = local_to_gmt(s, le32_to_cpu(de->read_date));
-		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;
+		inode_set_atime(root,
+				local_to_gmt(s, le32_to_cpu(de->read_date)),
+				0);
+		inode_set_mtime(root,
+				local_to_gmt(s, le32_to_cpu(de->write_date)),
+				0);
 		inode_set_ctime(root,
 				local_to_gmt(s, le32_to_cpu(de->creation_date)),
 				0);

[43/87] fs/hpfs: convert to new inode {a,m}time accessors

Commit Message

Patch