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 75/89] ufs: convert to new timestamp accessors
Date: Wed, 4 Oct 2023 14:53:00 -0400 [thread overview]
Message-ID: <20231004185347.80880-73-jlayton@kernel.org> (raw)
In-Reply-To: <20231004185347.80880-1-jlayton@kernel.org>
Convert to using the new inode timestamp accessor functions.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/ufs/dir.c | 6 +++---
fs/ufs/ialloc.c | 2 +-
fs/ufs/inode.c | 42 ++++++++++++++++++++++++------------------
3 files changed, 28 insertions(+), 22 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..338e4b97312f 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_sec(inode));
ufs_inode->ui_atime.tv_usec = 0;
ufs_inode->ui_ctime.tv_sec = cpu_to_fs32(sb,
- inode_get_ctime(inode).tv_sec);
+ inode_get_ctime_sec(inode));
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_sec(inode));
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_ctime = cpu_to_fs64(sb, inode_get_ctime(inode).tv_sec);
+ ufs_inode->ui_atime = cpu_to_fs64(sb, inode_get_atime_sec(inode));
+ ufs_inode->ui_atimensec = cpu_to_fs32(sb,
+ inode_get_atime_nsec(inode));
+ ufs_inode->ui_ctime = cpu_to_fs64(sb, inode_get_ctime_sec(inode));
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);
+ inode_get_ctime_nsec(inode));
+ ufs_inode->ui_mtime = cpu_to_fs64(sb, inode_get_mtime_sec(inode));
+ ufs_inode->ui_mtimensec = cpu_to_fs32(sb,
+ inode_get_mtime_nsec(inode));
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);
--
2.41.0
next prev parent reply other threads:[~2023-10-04 19:00 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 18:52 [PATCH v2 00/89] fs: new accessor methods for inode atime and mtime Jeff Layton
2023-10-04 18:51 ` [PATCH v2 03/89] spufs: convert to new timestamp accessors Jeff Layton
2023-10-04 18:51 ` [PATCH v2 04/89] hypfs: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 05/89] android: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 06/89] char: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 07/89] qib: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 08/89] ibmasm: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 09/89] misc: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 10/89] x86: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 11/89] tty: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 12/89] function: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 13/89] legacy: " Jeff Layton
2023-10-04 18:51 ` [PATCH v2 14/89] usb: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 15/89] 9p: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 16/89] adfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 17/89] affs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 18/89] afs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 19/89] autofs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 20/89] bcachefs: " Jeff Layton
2023-10-05 12:08 ` Brian Foster
2023-10-04 18:52 ` [PATCH v2 21/89] befs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 22/89] bfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 23/89] btrfs: " Jeff Layton
2023-10-09 16:53 ` David Sterba
2023-10-04 18:52 ` [PATCH v2 24/89] ceph: " Jeff Layton
2023-10-07 1:25 ` Xiubo Li
2023-10-04 18:52 ` [PATCH v2 25/89] coda: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 26/89] configfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 27/89] cramfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 28/89] debugfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 29/89] devpts: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 30/89] efivarfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 31/89] efs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 32/89] erofs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 33/89] exfat: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 34/89] ext2: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 35/89] ext4: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 36/89] f2fs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 37/89] fat: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 38/89] freevxfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 39/89] fuse: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 40/89] gfs2: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 41/89] hfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 42/89] hfsplus: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 43/89] hostfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 44/89] hpfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 45/89] hugetlbfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 46/89] isofs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 47/89] jffs2: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 48/89] jfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 49/89] kernfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 50/89] minix: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 51/89] nfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 52/89] nfsd: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 53/89] nilfs2: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 54/89] ntfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 55/89] ntfs3: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 56/89] ocfs2: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 57/89] omfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 58/89] openpromfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 59/89] orangefs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 60/89] overlayfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 61/89] proc: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 62/89] pstore: " Jeff Layton
2023-10-04 19:07 ` Kees Cook
2023-10-04 18:52 ` [PATCH v2 63/89] qnx4: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 64/89] qnx6: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 65/89] ramfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 66/89] reiserfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 67/89] romfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 68/89] client: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 69/89] server: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 70/89] squashfs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 71/89] sysv: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 72/89] tracefs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 73/89] ubifs: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 74/89] udf: " Jeff Layton
2023-10-04 18:53 ` Jeff Layton [this message]
2023-10-04 18:53 ` [PATCH v2 76/89] vboxsf: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 77/89] xfs: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 78/89] zonefs: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 79/89] linux: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 80/89] ipc: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 81/89] bpf: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 82/89] mm: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 83/89] sunrpc: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 84/89] apparmor: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 85/89] selinux: " Jeff Layton
2023-10-04 18:53 ` [PATCH v2 86/89] security: " Jeff Layton
2023-10-04 18:52 ` [PATCH v2 01/89] fs: new accessor methods for atime and mtime Jeff Layton
2023-10-04 18:52 ` [PATCH v2 02/89] fs: convert core infrastructure to new timestamp accessors Jeff Layton
2023-10-09 16:09 ` [PATCH v2 00/89] fs: new accessor methods for inode atime and mtime Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231004185347.80880-73-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox