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: gfs2@lists.linux.dev
Subject: [PATCH 39/87] fs/gfs2: convert to new inode {a,m}time accessors
Date: Thu, 28 Sep 2023 07:02:48 -0400 [thread overview]
Message-ID: <20230928110413.33032-38-jlayton@kernel.org> (raw)
In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/gfs2/bmap.c | 10 +++++-----
fs/gfs2/dir.c | 10 +++++-----
fs/gfs2/glops.c | 11 ++++++-----
fs/gfs2/inode.c | 7 ++++---
fs/gfs2/quota.c | 2 +-
fs/gfs2/super.c | 8 ++++----
6 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index ef7017fb6951..011cd992e0e6 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1386,7 +1386,7 @@ static int trunc_start(struct inode *inode, u64 newsize)
ip->i_diskflags |= GFS2_DIF_TRUNC_IN_PROG;
i_size_write(inode, newsize);
- ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);
+ inode_set_mtime_to_ts(&ip->i_inode, inode_set_ctime_current(&ip->i_inode));
gfs2_dinode_out(ip, dibh->b_data);
if (journaled)
@@ -1583,7 +1583,7 @@ static int sweep_bh_for_rgrps(struct gfs2_inode *ip, struct gfs2_holder *rd_gh,
/* Every transaction boundary, we rewrite the dinode
to keep its di_blocks current in case of failure. */
- ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);
+ inode_set_mtime_to_ts(&ip->i_inode, inode_set_ctime_current(&ip->i_inode));
gfs2_trans_add_meta(ip->i_gl, dibh);
gfs2_dinode_out(ip, dibh->b_data);
brelse(dibh);
@@ -1949,7 +1949,7 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length)
gfs2_statfs_change(sdp, 0, +btotal, 0);
gfs2_quota_change(ip, -(s64)btotal, ip->i_inode.i_uid,
ip->i_inode.i_gid);
- ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);
+ inode_set_mtime_to_ts(&ip->i_inode, inode_set_ctime_current(&ip->i_inode));
gfs2_trans_add_meta(ip->i_gl, dibh);
gfs2_dinode_out(ip, dibh->b_data);
up_write(&ip->i_rw_mutex);
@@ -1992,7 +1992,7 @@ static int trunc_end(struct gfs2_inode *ip)
gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));
gfs2_ordered_del_inode(ip);
}
- ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);
+ inode_set_mtime_to_ts(&ip->i_inode, inode_set_ctime_current(&ip->i_inode));
ip->i_diskflags &= ~GFS2_DIF_TRUNC_IN_PROG;
gfs2_trans_add_meta(ip->i_gl, dibh);
@@ -2093,7 +2093,7 @@ static int do_grow(struct inode *inode, u64 size)
goto do_end_trans;
truncate_setsize(inode, size);
- ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);
+ inode_set_mtime_to_ts(&ip->i_inode, inode_set_ctime_current(&ip->i_inode));
gfs2_trans_add_meta(ip->i_gl, dibh);
gfs2_dinode_out(ip, dibh->b_data);
brelse(dibh);
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 1a2afa88f8be..61ddd03ea111 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -130,7 +130,7 @@ static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf,
memcpy(dibh->b_data + offset + sizeof(struct gfs2_dinode), buf, size);
if (ip->i_inode.i_size < offset + size)
i_size_write(&ip->i_inode, offset + size);
- ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);
+ inode_set_mtime_to_ts(&ip->i_inode, inode_set_ctime_current(&ip->i_inode));
gfs2_dinode_out(ip, dibh->b_data);
brelse(dibh);
@@ -227,7 +227,7 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf,
if (ip->i_inode.i_size < offset + copied)
i_size_write(&ip->i_inode, offset + copied);
- ip->i_inode.i_mtime = inode_set_ctime_current(&ip->i_inode);
+ inode_set_mtime_to_ts(&ip->i_inode, inode_set_ctime_current(&ip->i_inode));
gfs2_trans_add_meta(ip->i_gl, dibh);
gfs2_dinode_out(ip, dibh->b_data);
@@ -1825,7 +1825,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name,
da->bh = NULL;
brelse(bh);
ip->i_entries++;
- ip->i_inode.i_mtime = tv;
+ inode_set_mtime_to_ts(&ip->i_inode, tv);
if (S_ISDIR(nip->i_inode.i_mode))
inc_nlink(&ip->i_inode);
mark_inode_dirty(inode);
@@ -1911,7 +1911,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry)
if (!dip->i_entries)
gfs2_consist_inode(dip);
dip->i_entries--;
- dip->i_inode.i_mtime = tv;
+ inode_set_mtime_to_ts(&dip->i_inode, tv);
if (d_is_dir(dentry))
drop_nlink(&dip->i_inode);
mark_inode_dirty(&dip->i_inode);
@@ -1952,7 +1952,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,
dent->de_type = cpu_to_be16(new_type);
brelse(bh);
- dip->i_inode.i_mtime = inode_set_ctime_current(&dip->i_inode);
+ inode_set_mtime_to_ts(&dip->i_inode, inode_set_ctime_current(&dip->i_inode));
mark_inode_dirty_sync(&dip->i_inode);
return 0;
}
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index f41ca89d216b..e7d334c277a1 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -403,7 +403,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
{
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
const struct gfs2_dinode *str = buf;
- struct timespec64 atime;
+ struct timespec64 atime, iatime;
u16 height, depth;
umode_t mode = be32_to_cpu(str->di_mode);
struct inode *inode = &ip->i_inode;
@@ -433,10 +433,11 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
gfs2_set_inode_blocks(inode, be64_to_cpu(str->di_blocks));
atime.tv_sec = be64_to_cpu(str->di_atime);
atime.tv_nsec = be32_to_cpu(str->di_atime_nsec);
- if (timespec64_compare(&inode->i_atime, &atime) < 0)
- inode->i_atime = atime;
- inode->i_mtime.tv_sec = be64_to_cpu(str->di_mtime);
- inode->i_mtime.tv_nsec = be32_to_cpu(str->di_mtime_nsec);
+ iatime = inode_get_atime(inode);
+ if (timespec64_compare(&iatime, &atime) < 0)
+ inode_set_atime_to_ts(inode, atime);
+ inode_set_mtime(inode, be64_to_cpu(str->di_mtime),
+ be32_to_cpu(str->di_mtime_nsec));
inode_set_ctime(inode, be64_to_cpu(str->di_ctime),
be32_to_cpu(str->di_ctime_nsec));
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 0eac04507904..6d15868fcd48 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -185,8 +185,9 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type,
set_bit(GLF_INSTANTIATE_NEEDED, &ip->i_gl->gl_flags);
/* Lowest possible timestamp; will be overwritten in gfs2_dinode_in. */
- inode->i_atime.tv_sec = 1LL << (8 * sizeof(inode->i_atime.tv_sec) - 1);
- inode->i_atime.tv_nsec = 0;
+ inode_set_atime(inode,
+ 1LL << (8 * sizeof(inode_get_atime(inode).tv_sec) - 1),
+ 0);
glock_set_object(ip->i_gl, ip);
@@ -696,7 +697,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
set_nlink(inode, S_ISDIR(mode) ? 2 : 1);
inode->i_rdev = dev;
inode->i_size = size;
- inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+ simple_inode_init_ts(inode);
munge_mode_uid_gid(dip, inode);
check_and_update_goal(dip);
ip->i_goal = dip->i_goal;
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 171b2713d2e5..d9854aece15b 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -886,7 +886,7 @@ static int gfs2_adjust_quota(struct gfs2_sbd *sdp, loff_t loc,
size = loc + sizeof(struct gfs2_quota);
if (size > inode->i_size)
i_size_write(inode, size);
- inode->i_mtime = inode_set_ctime_current(inode);
+ inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
mark_inode_dirty(inode);
set_bit(QDF_REFRESH, &qd->qd_flags);
}
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 02d93da21b2b..f5ee6c451bef 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -410,8 +410,8 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
str->di_nlink = cpu_to_be32(inode->i_nlink);
str->di_size = cpu_to_be64(i_size_read(inode));
str->di_blocks = cpu_to_be64(gfs2_get_inode_blocks(inode));
- str->di_atime = cpu_to_be64(inode->i_atime.tv_sec);
- str->di_mtime = cpu_to_be64(inode->i_mtime.tv_sec);
+ str->di_atime = cpu_to_be64(inode_get_atime(inode).tv_sec);
+ str->di_mtime = cpu_to_be64(inode_get_mtime(inode).tv_sec);
str->di_ctime = cpu_to_be64(inode_get_ctime(inode).tv_sec);
str->di_goal_meta = cpu_to_be64(ip->i_goal);
@@ -427,8 +427,8 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
str->di_entries = cpu_to_be32(ip->i_entries);
str->di_eattr = cpu_to_be64(ip->i_eattr);
- str->di_atime_nsec = cpu_to_be32(inode->i_atime.tv_nsec);
- str->di_mtime_nsec = cpu_to_be32(inode->i_mtime.tv_nsec);
+ str->di_atime_nsec = cpu_to_be32(inode_get_atime(inode).tv_nsec);
+ str->di_mtime_nsec = cpu_to_be32(inode_get_mtime(inode).tv_nsec);
str->di_ctime_nsec = cpu_to_be32(inode_get_ctime(inode).tv_nsec);
}
--
2.41.0
next prev parent reply other threads:[~2023-09-28 11:07 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 11:02 [PATCH 00/87] fs: new accessor methods for atime and mtime Jeff Layton
2023-09-28 11:02 ` [PATCH 02/87] fs: convert core infrastructure to new {a,m}time accessors Jeff Layton
2023-09-28 11:02 ` [PATCH 03/87] arch/powerpc/platforms/cell/spufs: convert to new inode " Jeff Layton
2023-09-28 11:02 ` [PATCH 04/87] arch/s390/hypfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 05/87] drivers/android: " Jeff Layton
2023-09-28 11:02 ` [PATCH 06/87] drivers/char: " Jeff Layton
2023-09-28 11:02 ` [PATCH 07/87] drivers/infiniband/hw/qib: " Jeff Layton
2023-09-28 11:02 ` [PATCH 08/87] drivers/misc/ibmasm: " Jeff Layton
2023-09-28 11:02 ` [PATCH 09/87] drivers/misc: " Jeff Layton
2023-09-28 11:02 ` [PATCH 10/87] drivers/platform/x86: " Jeff Layton
2023-09-28 12:34 ` Hans de Goede
2023-09-28 11:02 ` [PATCH 11/87] drivers/tty: " Jeff Layton
2023-09-28 12:13 ` Greg KH
2023-09-28 12:23 ` Jeff Layton
2023-09-28 11:02 ` [PATCH 12/87] drivers/usb/core: " Jeff Layton
2023-09-28 11:02 ` [PATCH 13/87] drivers/usb/gadget/function: " Jeff Layton
2023-09-28 11:02 ` [PATCH 14/87] drivers/usb/gadget/legacy: " Jeff Layton
2023-09-28 11:02 ` [PATCH 15/87] fs/9p: " Jeff Layton
2023-09-28 11:02 ` [PATCH 16/87] fs/adfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 17/87] fs/affs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 18/87] fs/afs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 19/87] fs/autofs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 20/87] fs/befs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 21/87] fs/bfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 22/87] fs/btrfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 23/87] fs/ceph: " Jeff Layton
2023-09-28 11:02 ` [PATCH 24/87] fs/coda: " Jeff Layton
2023-09-28 11:02 ` [PATCH 25/87] fs/configfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 26/87] fs/cramfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 27/87] fs/debugfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 28/87] fs/devpts: " Jeff Layton
2023-09-28 11:02 ` [PATCH 29/87] fs/efivarfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 30/87] fs/efs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 31/87] fs/erofs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 32/87] fs/exfat: " Jeff Layton
2023-09-28 11:02 ` [PATCH 33/87] fs/ext2: " Jeff Layton
2023-09-28 11:02 ` [PATCH 34/87] fs/ext4: " Jeff Layton
2023-09-28 11:02 ` [PATCH 35/87] fs/f2fs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 36/87] fs/fat: " Jeff Layton
2023-09-28 11:02 ` [PATCH 37/87] fs/freevxfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 38/87] fs/fuse: " Jeff Layton
2023-09-28 11:02 ` Jeff Layton [this message]
2023-09-28 11:02 ` [PATCH 40/87] fs/hfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 41/87] fs/hfsplus: " Jeff Layton
2023-09-28 11:02 ` [PATCH 42/87] fs/hostfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 43/87] fs/hpfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 44/87] fs/hugetlbfs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 45/87] fs/isofs: " Jeff Layton
2023-09-28 11:02 ` [PATCH 46/87] fs/jffs2: " Jeff Layton
2023-09-28 11:02 ` [PATCH 47/87] fs/jfs: " Jeff Layton
2023-10-03 16:33 ` [Jfs-discussion] [PATCH 47/87] fs/jfs: convert to new inode {a, m}time accessors Dave Kleikamp
2023-09-28 11:02 ` [PATCH 48/87] fs/kernfs: convert to new inode {a,m}time accessors Jeff Layton
2023-09-28 11:02 ` [PATCH 49/87] fs/minix: " Jeff Layton
2023-09-28 11:02 ` [PATCH 50/87] fs/nfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 51/87] fs/nfsd: " Jeff Layton
2023-09-28 13:56 ` Chuck Lever
2023-09-28 14:09 ` Jeff Layton
2023-09-28 14:33 ` Chuck Lever
2023-09-28 11:03 ` [PATCH 52/87] fs/nilfs2: " Jeff Layton
2023-09-28 11:03 ` [PATCH 53/87] fs/ntfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 54/87] fs/ntfs3: " Jeff Layton
2023-09-28 11:03 ` [PATCH 55/87] fs/ocfs2: " Jeff Layton
2023-09-28 11:03 ` [PATCH 56/87] fs/omfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 57/87] fs/openpromfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 58/87] fs/orangefs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 59/87] fs/overlayfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 60/87] fs/proc: " Jeff Layton
2023-09-28 11:03 ` [PATCH 61/87] fs/pstore: " Jeff Layton
2023-09-28 11:03 ` [PATCH 62/87] fs/qnx4: " Jeff Layton
2023-09-28 12:41 ` Anders Larsen
2023-09-28 11:03 ` [PATCH 63/87] fs/qnx6: " Jeff Layton
2023-09-28 11:03 ` [PATCH 64/87] fs/ramfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 65/87] fs/reiserfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 66/87] fs/romfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 67/87] fs/smb/client: " Jeff Layton
2023-09-28 11:03 ` [PATCH 68/87] fs/smb/server: " Jeff Layton
2023-09-28 11:03 ` [PATCH 69/87] fs/squashfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 70/87] fs/sysv: " Jeff Layton
2023-09-28 11:03 ` [PATCH 71/87] fs/tracefs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 72/87] fs/ubifs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 73/87] fs/udf: " Jeff Layton
2023-09-28 11:03 ` [PATCH 74/87] fs/ufs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 75/87] fs/vboxsf: " Jeff Layton
2023-09-28 11:03 ` [PATCH 76/87] fs/xfs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 77/87] fs/zonefs: " Jeff Layton
2023-09-28 11:03 ` [PATCH 78/87] ipc: " Jeff Layton
2023-09-28 11:03 ` [PATCH 79/87] kernel/bpf: " Jeff Layton
2023-09-28 11:03 ` [PATCH 80/87] mm: " Jeff Layton
2023-09-28 11:03 ` [PATCH 81/87] net/sunrpc: " Jeff Layton
2023-09-28 11:03 ` [PATCH 82/87] security/apparmor: " Jeff Layton
2023-09-28 11:03 ` [PATCH 83/87] security/selinux: " Jeff Layton
2023-10-03 19:53 ` Paul Moore
2023-09-28 11:03 ` [PATCH 84/87] security: " Jeff Layton
2023-10-03 23:41 ` Paul Moore
2023-09-28 11:03 ` [PATCH 01/87] fs: new accessor methods for atime and mtime Jeff Layton
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=20230928110413.33032-38-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=brauner@kernel.org \
--cc=gfs2@lists.linux.dev \
--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;
as well as URLs for NNTP newsgroup(s).