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
Cc: linux-ext4@vger.kernel.org
Subject: [PATCH v2 34/89] ext2: convert to new timestamp accessors
Date: Wed, 4 Oct 2023 14:52:19 -0400 [thread overview]
Message-ID: <20231004185347.80880-32-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/ext2/dir.c | 6 +++---
fs/ext2/ialloc.c | 2 +-
fs/ext2/inode.c | 13 ++++++-------
fs/ext2/super.c | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index b335f17f682f..c7900868171b 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -468,7 +468,7 @@ int ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
ext2_set_de_type(de, inode);
ext2_commit_chunk(page, pos, len);
if (update_times)
- dir->i_mtime = inode_set_ctime_current(dir);
+ inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
mark_inode_dirty(dir);
return ext2_handle_dirsync(dir);
@@ -555,7 +555,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
de->inode = cpu_to_le32(inode->i_ino);
ext2_set_de_type (de, inode);
ext2_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));
EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;
mark_inode_dirty(dir);
err = ext2_handle_dirsync(dir);
@@ -606,7 +606,7 @@ int ext2_delete_entry(struct ext2_dir_entry_2 *dir, struct page *page)
pde->rec_len = ext2_rec_len_to_disk(to - from);
dir->inode = 0;
ext2_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));
EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;
mark_inode_dirty(inode);
return ext2_handle_dirsync(inode);
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index c24d0de95a83..fdf63e9c6e7c 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -546,7 +546,7 @@ struct inode *ext2_new_inode(struct inode *dir, umode_t mode,
inode->i_ino = ino;
inode->i_blocks = 0;
- inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+ simple_inode_init_ts(inode);
memset(ei->i_data, 0, sizeof(ei->i_data));
ei->i_flags =
ext2_mask_flags(mode, EXT2_I(dir)->i_flags & EXT2_FL_INHERITED);
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 314b415ee518..464faf6c217e 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1291,7 +1291,7 @@ static int ext2_setsize(struct inode *inode, loff_t newsize)
__ext2_truncate_blocks(inode, newsize);
filemap_invalidate_unlock(inode->i_mapping);
- inode->i_mtime = inode_set_ctime_current(inode);
+ inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
if (inode_needs_sync(inode)) {
sync_mapping_buffers(inode->i_mapping);
sync_inode_metadata(inode, 1);
@@ -1412,10 +1412,9 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
i_gid_write(inode, i_gid);
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size);
- inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
+ inode_set_atime(inode, (signed)le32_to_cpu(raw_inode->i_atime), 0);
inode_set_ctime(inode, (signed)le32_to_cpu(raw_inode->i_ctime), 0);
- inode->i_mtime.tv_sec = (signed)le32_to_cpu(raw_inode->i_mtime);
- inode->i_atime.tv_nsec = inode->i_mtime.tv_nsec = 0;
+ inode_set_mtime(inode, (signed)le32_to_cpu(raw_inode->i_mtime), 0);
ei->i_dtime = le32_to_cpu(raw_inode->i_dtime);
/* We now have enough fields to check if the inode was active or not.
* This is needed because nfsd might try to access dead inodes
@@ -1544,9 +1543,9 @@ static int __ext2_write_inode(struct inode *inode, int do_sync)
}
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
raw_inode->i_size = cpu_to_le32(inode->i_size);
- raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
- raw_inode->i_ctime = cpu_to_le32(inode_get_ctime(inode).tv_sec);
- raw_inode->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
+ raw_inode->i_atime = cpu_to_le32(inode_get_atime_sec(inode));
+ raw_inode->i_ctime = cpu_to_le32(inode_get_ctime_sec(inode));
+ raw_inode->i_mtime = cpu_to_le32(inode_get_mtime_sec(inode));
raw_inode->i_blocks = cpu_to_le32(inode->i_blocks);
raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index aaf3e3e88cb2..645ee6142f69 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1572,7 +1572,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,
if (inode->i_size < off+len-towrite)
i_size_write(inode, off+len-towrite);
inode_inc_iversion(inode);
- inode->i_mtime = inode_set_ctime_current(inode);
+ inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
mark_inode_dirty(inode);
return len - towrite;
}
--
2.41.0
next prev parent reply other threads:[~2023-10-04 18:56 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 ` Jeff Layton [this message]
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 ` [PATCH v2 75/89] ufs: " Jeff Layton
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-32-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-ext4@vger.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