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-mtd@lists.infradead.org
Subject: [PATCH v2 47/89] jffs2: convert to new timestamp accessors
Date: Wed, 4 Oct 2023 14:52:32 -0400 [thread overview]
Message-ID: <20231004185347.80880-45-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/jffs2/dir.c | 35 ++++++++++++++++++++---------------
fs/jffs2/file.c | 4 ++--
fs/jffs2/fs.c | 20 ++++++++++----------
fs/jffs2/os-linux.h | 4 ++--
4 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 091ab0eaabbe..2b2938970da3 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -204,8 +204,8 @@ static int jffs2_create(struct mnt_idmap *idmap, struct inode *dir_i,
if (ret)
goto fail;
- dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
- ITIME(je32_to_cpu(ri->ctime)));
+ inode_set_mtime_to_ts(dir_i,
+ inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(ri->ctime))));
jffs2_free_raw_inode(ri);
@@ -238,7 +238,8 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
if (dead_f->inocache)
set_nlink(d_inode(dentry), dead_f->inocache->pino_nlink);
if (!ret)
- dir_i->i_mtime = inode_set_ctime_to_ts(dir_i, ITIME(now));
+ inode_set_mtime_to_ts(dir_i,
+ inode_set_ctime_to_ts(dir_i, ITIME(now)));
return ret;
}
/***********************************************************************/
@@ -272,7 +273,8 @@ static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct de
set_nlink(d_inode(old_dentry), ++f->inocache->pino_nlink);
mutex_unlock(&f->sem);
d_instantiate(dentry, d_inode(old_dentry));
- dir_i->i_mtime = inode_set_ctime_to_ts(dir_i, ITIME(now));
+ inode_set_mtime_to_ts(dir_i,
+ inode_set_ctime_to_ts(dir_i, ITIME(now)));
ihold(d_inode(old_dentry));
}
return ret;
@@ -423,8 +425,8 @@ static int jffs2_symlink (struct mnt_idmap *idmap, struct inode *dir_i,
goto fail;
}
- dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
- ITIME(je32_to_cpu(rd->mctime)));
+ inode_set_mtime_to_ts(dir_i,
+ inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(rd->mctime))));
jffs2_free_raw_dirent(rd);
@@ -568,8 +570,8 @@ static int jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,
goto fail;
}
- dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
- ITIME(je32_to_cpu(rd->mctime)));
+ inode_set_mtime_to_ts(dir_i,
+ inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(rd->mctime))));
inc_nlink(dir_i);
jffs2_free_raw_dirent(rd);
@@ -610,7 +612,8 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
ret = jffs2_do_unlink(c, dir_f, dentry->d_name.name,
dentry->d_name.len, f, now);
if (!ret) {
- dir_i->i_mtime = inode_set_ctime_to_ts(dir_i, ITIME(now));
+ inode_set_mtime_to_ts(dir_i,
+ inode_set_ctime_to_ts(dir_i, ITIME(now)));
clear_nlink(d_inode(dentry));
drop_nlink(dir_i);
}
@@ -746,8 +749,8 @@ static int jffs2_mknod (struct mnt_idmap *idmap, struct inode *dir_i,
goto fail;
}
- dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
- ITIME(je32_to_cpu(rd->mctime)));
+ inode_set_mtime_to_ts(dir_i,
+ inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(rd->mctime))));
jffs2_free_raw_dirent(rd);
@@ -868,16 +871,18 @@ static int jffs2_rename (struct mnt_idmap *idmap,
* caller won't do it on its own since we are returning an error.
*/
d_invalidate(new_dentry);
- new_dir_i->i_mtime = inode_set_ctime_to_ts(new_dir_i,
- ITIME(now));
+ inode_set_mtime_to_ts(new_dir_i,
+ inode_set_ctime_to_ts(new_dir_i, ITIME(now)));
return ret;
}
if (d_is_dir(old_dentry))
drop_nlink(old_dir_i);
- old_dir_i->i_mtime = inode_set_ctime_to_ts(old_dir_i, ITIME(now));
- new_dir_i->i_mtime = inode_set_ctime_to_ts(new_dir_i, ITIME(now));
+ inode_set_mtime_to_ts(old_dir_i,
+ inode_set_ctime_to_ts(old_dir_i, ITIME(now)));
+ inode_set_mtime_to_ts(new_dir_i,
+ inode_set_ctime_to_ts(new_dir_i, ITIME(now)));
return 0;
}
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 11c66793960e..62ea76da7fdf 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -317,8 +317,8 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,
inode->i_size = pos + writtenlen;
inode->i_blocks = (inode->i_size + 511) >> 9;
- inode->i_mtime = inode_set_ctime_to_ts(inode,
- ITIME(je32_to_cpu(ri->ctime)));
+ inode_set_mtime_to_ts(inode,
+ inode_set_ctime_to_ts(inode, ITIME(je32_to_cpu(ri->ctime))));
}
}
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 0403efab4089..d175cccb7c55 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -113,8 +113,8 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
ri->isize = cpu_to_je32((ivalid & ATTR_SIZE)?iattr->ia_size:inode->i_size);
- ri->atime = cpu_to_je32(I_SEC((ivalid & ATTR_ATIME)?iattr->ia_atime:inode->i_atime));
- ri->mtime = cpu_to_je32(I_SEC((ivalid & ATTR_MTIME)?iattr->ia_mtime:inode->i_mtime));
+ ri->atime = cpu_to_je32(I_SEC((ivalid & ATTR_ATIME)?iattr->ia_atime:inode_get_atime(inode)));
+ ri->mtime = cpu_to_je32(I_SEC((ivalid & ATTR_MTIME)?iattr->ia_mtime:inode_get_mtime(inode)));
ri->ctime = cpu_to_je32(I_SEC((ivalid & ATTR_CTIME)?iattr->ia_ctime:inode_get_ctime(inode)));
ri->offset = cpu_to_je32(0);
@@ -147,9 +147,9 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
return PTR_ERR(new_metadata);
}
/* It worked. Update the inode */
- inode->i_atime = ITIME(je32_to_cpu(ri->atime));
+ inode_set_atime_to_ts(inode, ITIME(je32_to_cpu(ri->atime)));
inode_set_ctime_to_ts(inode, ITIME(je32_to_cpu(ri->ctime)));
- inode->i_mtime = ITIME(je32_to_cpu(ri->mtime));
+ inode_set_mtime_to_ts(inode, ITIME(je32_to_cpu(ri->mtime)));
inode->i_mode = jemode_to_cpu(ri->mode);
i_uid_write(inode, je16_to_cpu(ri->uid));
i_gid_write(inode, je16_to_cpu(ri->gid));
@@ -282,8 +282,8 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino)
i_uid_write(inode, je16_to_cpu(latest_node.uid));
i_gid_write(inode, je16_to_cpu(latest_node.gid));
inode->i_size = je32_to_cpu(latest_node.isize);
- inode->i_atime = ITIME(je32_to_cpu(latest_node.atime));
- inode->i_mtime = ITIME(je32_to_cpu(latest_node.mtime));
+ inode_set_atime_to_ts(inode, ITIME(je32_to_cpu(latest_node.atime)));
+ inode_set_mtime_to_ts(inode, ITIME(je32_to_cpu(latest_node.mtime)));
inode_set_ctime_to_ts(inode, ITIME(je32_to_cpu(latest_node.ctime)));
set_nlink(inode, f->inocache->pino_nlink);
@@ -386,8 +386,8 @@ void jffs2_dirty_inode(struct inode *inode, int flags)
iattr.ia_mode = inode->i_mode;
iattr.ia_uid = inode->i_uid;
iattr.ia_gid = inode->i_gid;
- iattr.ia_atime = inode->i_atime;
- iattr.ia_mtime = inode->i_mtime;
+ iattr.ia_atime = inode_get_atime(inode);
+ iattr.ia_mtime = inode_get_mtime(inode);
iattr.ia_ctime = inode_get_ctime(inode);
jffs2_do_setattr(inode, &iattr);
@@ -475,8 +475,8 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r
inode->i_mode = jemode_to_cpu(ri->mode);
i_gid_write(inode, je16_to_cpu(ri->gid));
i_uid_write(inode, je16_to_cpu(ri->uid));
- inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
- ri->atime = ri->mtime = ri->ctime = cpu_to_je32(I_SEC(inode->i_mtime));
+ simple_inode_init_ts(inode);
+ ri->atime = ri->mtime = ri->ctime = cpu_to_je32(I_SEC(inode_get_mtime(inode)));
inode->i_blocks = 0;
inode->i_size = 0;
diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h
index 50727a1ff931..86ab014a349c 100644
--- a/fs/jffs2/os-linux.h
+++ b/fs/jffs2/os-linux.h
@@ -36,8 +36,8 @@ struct kvec;
#define JFFS2_NOW() JFFS2_CLAMP_TIME(ktime_get_real_seconds())
#define I_SEC(tv) JFFS2_CLAMP_TIME((tv).tv_sec)
#define JFFS2_F_I_CTIME(f) I_SEC(inode_get_ctime(OFNI_EDONI_2SFFJ(f)))
-#define JFFS2_F_I_MTIME(f) I_SEC(OFNI_EDONI_2SFFJ(f)->i_mtime)
-#define JFFS2_F_I_ATIME(f) I_SEC(OFNI_EDONI_2SFFJ(f)->i_atime)
+#define JFFS2_F_I_MTIME(f) I_SEC(inode_get_mtime(OFNI_EDONI_2SFFJ(f)))
+#define JFFS2_F_I_ATIME(f) I_SEC(inode_get_atime(OFNI_EDONI_2SFFJ(f)))
#define sleep_on_spinunlock(wq, s) \
do { \
DECLARE_WAITQUEUE(__wait, current); \
--
2.41.0
next prev parent reply other threads:[~2023-10-04 18:57 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 ` Jeff Layton [this message]
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-45-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.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