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

Message ID	20230928110413.33032-73-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 74/87] fs/ufs: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:03:23 -0400 Message-ID: <20230928110413.33032-73-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-73-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 74/87] fs/ufs: convert to new inode {a,m}time accessors
Date: Thu, 28 Sep 2023 07:03:23 -0400
Message-ID: <20230928110413.33032-73-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:03 a.m. UTC

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/ufs/dir.c    |  6 +++---
 fs/ufs/ialloc.c |  2 +-
 fs/ufs/inode.c  | 36 +++++++++++++++++++++---------------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index fd57f03b6c93..27c85d92d1dc 100644
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -107,7 +107,7 @@  void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
 	ufs_commit_chunk(page, pos, len);
 	ufs_put_page(page);
 	if (update_times)
-		dir->i_mtime = inode_set_ctime_current(dir);
+		inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
 	mark_inode_dirty(dir);
 	ufs_handle_dirsync(dir);
 }
@@ -397,7 +397,7 @@  int ufs_add_link(struct dentry *dentry, struct inode *inode)
 	ufs_set_de_type(sb, de, inode->i_mode);
 
 	ufs_commit_chunk(page, pos, rec_len);
-	dir->i_mtime = inode_set_ctime_current(dir);
+	inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
 
 	mark_inode_dirty(dir);
 	err = ufs_handle_dirsync(dir);
@@ -539,7 +539,7 @@  int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
 		pde->d_reclen = cpu_to_fs16(sb, to - from);
 	dir->d_ino = 0;
 	ufs_commit_chunk(page, pos, to - from);
-	inode->i_mtime = inode_set_ctime_current(inode);
+	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 	mark_inode_dirty(inode);
 	err = ufs_handle_dirsync(inode);
 out:
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index a1e7bd9d1f98..73531827ecee 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -292,7 +292,7 @@  struct inode *ufs_new_inode(struct inode *dir, umode_t mode)
 	inode_init_owner(&nop_mnt_idmap, inode, dir, mode);
 	inode->i_blocks = 0;
 	inode->i_generation = 0;
-	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+	simple_inode_init_ts(inode);
 	ufsi->i_flags = UFS_I(dir)->i_flags;
 	ufsi->i_lastfrag = 0;
 	ufsi->i_shadow = 0;
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 21a4779a2de5..b0877667940d 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -579,13 +579,15 @@  static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
 	i_gid_write(inode, ufs_get_inode_gid(sb, ufs_inode));
 
 	inode->i_size = fs64_to_cpu(sb, ufs_inode->ui_size);
-	inode->i_atime.tv_sec = (signed)fs32_to_cpu(sb, ufs_inode->ui_atime.tv_sec);
+	inode_set_atime(inode,
+			(signed)fs32_to_cpu(sb, ufs_inode->ui_atime.tv_sec),
+			0);
 	inode_set_ctime(inode,
 			(signed)fs32_to_cpu(sb, ufs_inode->ui_ctime.tv_sec),
 			0);
-	inode->i_mtime.tv_sec = (signed)fs32_to_cpu(sb, ufs_inode->ui_mtime.tv_sec);
-	inode->i_mtime.tv_nsec = 0;
-	inode->i_atime.tv_nsec = 0;
+	inode_set_mtime(inode,
+			(signed)fs32_to_cpu(sb, ufs_inode->ui_mtime.tv_sec),
+			0);
 	inode->i_blocks = fs32_to_cpu(sb, ufs_inode->ui_blocks);
 	inode->i_generation = fs32_to_cpu(sb, ufs_inode->ui_gen);
 	ufsi->i_flags = fs32_to_cpu(sb, ufs_inode->ui_flags);
@@ -626,12 +628,12 @@  static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
 	i_gid_write(inode, fs32_to_cpu(sb, ufs2_inode->ui_gid));
 
 	inode->i_size = fs64_to_cpu(sb, ufs2_inode->ui_size);
-	inode->i_atime.tv_sec = fs64_to_cpu(sb, ufs2_inode->ui_atime);
+	inode_set_atime(inode, fs64_to_cpu(sb, ufs2_inode->ui_atime),
+			fs32_to_cpu(sb, ufs2_inode->ui_atimensec));
 	inode_set_ctime(inode, fs64_to_cpu(sb, ufs2_inode->ui_ctime),
 			fs32_to_cpu(sb, ufs2_inode->ui_ctimensec));
-	inode->i_mtime.tv_sec = fs64_to_cpu(sb, ufs2_inode->ui_mtime);
-	inode->i_atime.tv_nsec = fs32_to_cpu(sb, ufs2_inode->ui_atimensec);
-	inode->i_mtime.tv_nsec = fs32_to_cpu(sb, ufs2_inode->ui_mtimensec);
+	inode_set_mtime(inode, fs64_to_cpu(sb, ufs2_inode->ui_mtime),
+			fs32_to_cpu(sb, ufs2_inode->ui_mtimensec));
 	inode->i_blocks = fs64_to_cpu(sb, ufs2_inode->ui_blocks);
 	inode->i_generation = fs32_to_cpu(sb, ufs2_inode->ui_gen);
 	ufsi->i_flags = fs32_to_cpu(sb, ufs2_inode->ui_flags);
@@ -725,12 +727,14 @@  static void ufs1_update_inode(struct inode *inode, struct ufs_inode *ufs_inode)
 	ufs_set_inode_gid(sb, ufs_inode, i_gid_read(inode));
 
 	ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size);
-	ufs_inode->ui_atime.tv_sec = cpu_to_fs32(sb, inode->i_atime.tv_sec);
+	ufs_inode->ui_atime.tv_sec = cpu_to_fs32(sb,
+						 inode_get_atime(inode).tv_sec);
 	ufs_inode->ui_atime.tv_usec = 0;
 	ufs_inode->ui_ctime.tv_sec = cpu_to_fs32(sb,
 						 inode_get_ctime(inode).tv_sec);
 	ufs_inode->ui_ctime.tv_usec = 0;
-	ufs_inode->ui_mtime.tv_sec = cpu_to_fs32(sb, inode->i_mtime.tv_sec);
+	ufs_inode->ui_mtime.tv_sec = cpu_to_fs32(sb,
+						 inode_get_mtime(inode).tv_sec);
 	ufs_inode->ui_mtime.tv_usec = 0;
 	ufs_inode->ui_blocks = cpu_to_fs32(sb, inode->i_blocks);
 	ufs_inode->ui_flags = cpu_to_fs32(sb, ufsi->i_flags);
@@ -770,13 +774,15 @@  static void ufs2_update_inode(struct inode *inode, struct ufs2_inode *ufs_inode)
 	ufs_inode->ui_gid = cpu_to_fs32(sb, i_gid_read(inode));
 
 	ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size);
-	ufs_inode->ui_atime = cpu_to_fs64(sb, inode->i_atime.tv_sec);
-	ufs_inode->ui_atimensec = cpu_to_fs32(sb, inode->i_atime.tv_nsec);
+	ufs_inode->ui_atime = cpu_to_fs64(sb, inode_get_atime(inode).tv_sec);
+	ufs_inode->ui_atimensec = cpu_to_fs32(sb,
+					      inode_get_atime(inode).tv_nsec);
 	ufs_inode->ui_ctime = cpu_to_fs64(sb, inode_get_ctime(inode).tv_sec);
 	ufs_inode->ui_ctimensec = cpu_to_fs32(sb,
 					      inode_get_ctime(inode).tv_nsec);
-	ufs_inode->ui_mtime = cpu_to_fs64(sb, inode->i_mtime.tv_sec);
-	ufs_inode->ui_mtimensec = cpu_to_fs32(sb, inode->i_mtime.tv_nsec);
+	ufs_inode->ui_mtime = cpu_to_fs64(sb, inode_get_mtime(inode).tv_sec);
+	ufs_inode->ui_mtimensec = cpu_to_fs32(sb,
+					      inode_get_mtime(inode).tv_nsec);
 
 	ufs_inode->ui_blocks = cpu_to_fs64(sb, inode->i_blocks);
 	ufs_inode->ui_flags = cpu_to_fs32(sb, ufsi->i_flags);
@@ -1208,7 +1214,7 @@  static int ufs_truncate(struct inode *inode, loff_t size)
 	truncate_setsize(inode, size);
 
 	ufs_truncate_blocks(inode);
-	inode->i_mtime = inode_set_ctime_current(inode);
+	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 	mark_inode_dirty(inode);
 out:
 	UFSD("EXIT: err %d\n", err);

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

Commit Message

Patch