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-nilfs@vger.kernel.org Subject: [PATCH 52/87] fs/nilfs2: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:03:01 -0400 [thread overview] Message-ID: <20230928110413.33032-51-jlayton@kernel.org> (raw) In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org> Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/nilfs2/dir.c | 6 +++--- fs/nilfs2/inode.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index bce734b68f08..de2073c47651 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -429,7 +429,7 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de, nilfs_set_de_type(de, inode); nilfs_commit_chunk(page, mapping, from, to); nilfs_put_page(page); - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); } /* @@ -519,7 +519,7 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode) de->inode = cpu_to_le64(inode->i_ino); nilfs_set_de_type(de, inode); nilfs_commit_chunk(page, page->mapping, from, to); - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); nilfs_mark_inode_dirty(dir); /* OFFSET_CACHE */ out_put: @@ -567,7 +567,7 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page) pde->rec_len = nilfs_rec_len_to_disk(to - from); dir->inode = 0; nilfs_commit_chunk(page, mapping, from, to); - inode->i_mtime = inode_set_ctime_current(inode); + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); out: nilfs_put_page(page); return err; diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 1a8bd5993476..b59380a8bbc0 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -366,7 +366,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) atomic64_inc(&root->inodes_count); inode_init_owner(&nop_mnt_idmap, inode, dir, mode); inode->i_ino = ino; - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) { err = nilfs_bmap_read(ii->i_bmap, NULL); @@ -449,12 +449,12 @@ int nilfs_read_inode_common(struct inode *inode, i_gid_write(inode, le32_to_cpu(raw_inode->i_gid)); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); inode->i_size = le64_to_cpu(raw_inode->i_size); - inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime); + inode_set_atime(inode, le64_to_cpu(raw_inode->i_mtime), + le32_to_cpu(raw_inode->i_mtime_nsec)); inode_set_ctime(inode, le64_to_cpu(raw_inode->i_ctime), le32_to_cpu(raw_inode->i_ctime_nsec)); - inode->i_mtime.tv_sec = le64_to_cpu(raw_inode->i_mtime); - inode->i_atime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec); - inode->i_mtime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec); + inode_set_mtime(inode, le64_to_cpu(raw_inode->i_mtime), + le32_to_cpu(raw_inode->i_mtime_nsec)); if (nilfs_is_metadata_file_inode(inode) && !S_ISREG(inode->i_mode)) return -EIO; /* this inode is for metadata and corrupted */ if (inode->i_nlink == 0) @@ -769,9 +769,9 @@ void nilfs_write_inode_common(struct inode *inode, raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le64(inode->i_size); raw_inode->i_ctime = cpu_to_le64(inode_get_ctime(inode).tv_sec); - raw_inode->i_mtime = cpu_to_le64(inode->i_mtime.tv_sec); + raw_inode->i_mtime = cpu_to_le64(inode_get_mtime(inode).tv_sec); raw_inode->i_ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec); - raw_inode->i_mtime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec); + raw_inode->i_mtime_nsec = cpu_to_le32(inode_get_mtime(inode).tv_nsec); raw_inode->i_blocks = cpu_to_le64(inode->i_blocks); raw_inode->i_flags = cpu_to_le32(ii->i_flags); @@ -875,7 +875,7 @@ void nilfs_truncate(struct inode *inode) nilfs_truncate_bmap(ii, blkoff); - inode->i_mtime = inode_set_ctime_current(inode); + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); if (IS_SYNC(inode)) nilfs_set_transaction_flag(NILFS_TI_SYNC); -- 2.41.0
WARNING: multiple messages have this Message-ID (diff)
From: Jeff Layton <jlayton-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> To: Alexander Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>, Christian Brauner <brauner-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-nilfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH 52/87] fs/nilfs2: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:03:01 -0400 [thread overview] Message-ID: <20230928110413.33032-51-jlayton@kernel.org> (raw) In-Reply-To: <20230928110413.33032-1-jlayton-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Signed-off-by: Jeff Layton <jlayton-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> --- fs/nilfs2/dir.c | 6 +++--- fs/nilfs2/inode.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index bce734b68f08..de2073c47651 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -429,7 +429,7 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de, nilfs_set_de_type(de, inode); nilfs_commit_chunk(page, mapping, from, to); nilfs_put_page(page); - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); } /* @@ -519,7 +519,7 @@ int nilfs_add_link(struct dentry *dentry, struct inode *inode) de->inode = cpu_to_le64(inode->i_ino); nilfs_set_de_type(de, inode); nilfs_commit_chunk(page, page->mapping, from, to); - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); nilfs_mark_inode_dirty(dir); /* OFFSET_CACHE */ out_put: @@ -567,7 +567,7 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page) pde->rec_len = nilfs_rec_len_to_disk(to - from); dir->inode = 0; nilfs_commit_chunk(page, mapping, from, to); - inode->i_mtime = inode_set_ctime_current(inode); + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); out: nilfs_put_page(page); return err; diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 1a8bd5993476..b59380a8bbc0 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -366,7 +366,7 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) atomic64_inc(&root->inodes_count); inode_init_owner(&nop_mnt_idmap, inode, dir, mode); inode->i_ino = ino; - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) { err = nilfs_bmap_read(ii->i_bmap, NULL); @@ -449,12 +449,12 @@ int nilfs_read_inode_common(struct inode *inode, i_gid_write(inode, le32_to_cpu(raw_inode->i_gid)); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); inode->i_size = le64_to_cpu(raw_inode->i_size); - inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime); + inode_set_atime(inode, le64_to_cpu(raw_inode->i_mtime), + le32_to_cpu(raw_inode->i_mtime_nsec)); inode_set_ctime(inode, le64_to_cpu(raw_inode->i_ctime), le32_to_cpu(raw_inode->i_ctime_nsec)); - inode->i_mtime.tv_sec = le64_to_cpu(raw_inode->i_mtime); - inode->i_atime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec); - inode->i_mtime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec); + inode_set_mtime(inode, le64_to_cpu(raw_inode->i_mtime), + le32_to_cpu(raw_inode->i_mtime_nsec)); if (nilfs_is_metadata_file_inode(inode) && !S_ISREG(inode->i_mode)) return -EIO; /* this inode is for metadata and corrupted */ if (inode->i_nlink == 0) @@ -769,9 +769,9 @@ void nilfs_write_inode_common(struct inode *inode, raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le64(inode->i_size); raw_inode->i_ctime = cpu_to_le64(inode_get_ctime(inode).tv_sec); - raw_inode->i_mtime = cpu_to_le64(inode->i_mtime.tv_sec); + raw_inode->i_mtime = cpu_to_le64(inode_get_mtime(inode).tv_sec); raw_inode->i_ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec); - raw_inode->i_mtime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec); + raw_inode->i_mtime_nsec = cpu_to_le32(inode_get_mtime(inode).tv_nsec); raw_inode->i_blocks = cpu_to_le64(inode->i_blocks); raw_inode->i_flags = cpu_to_le32(ii->i_flags); @@ -875,7 +875,7 @@ void nilfs_truncate(struct inode *inode) nilfs_truncate_bmap(ii, blkoff); - inode->i_mtime = inode_set_ctime_current(inode); + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); if (IS_SYNC(inode)) nilfs_set_transaction_flag(NILFS_TI_SYNC); -- 2.41.0
next prev parent reply other threads:[~2023-09-28 11:08 UTC|newest] Thread overview: 112+ 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 ` Jeff Layton 2023-09-28 11:02 ` Jeff Layton 2023-09-28 11:02 ` Jeff Layton 2023-09-28 11:02 ` Jeff Layton 2023-09-28 11:02 ` [f2fs-dev] " 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 ` 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 ` 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 ` [f2fs-dev] [PATCH 35/87] fs/f2fs: convert to new inode {a, m}time accessors Jeff Layton 2023-09-28 11:02 ` [PATCH 35/87] fs/f2fs: convert to new inode {a,m}time accessors 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 ` [PATCH 39/87] fs/gfs2: " Jeff Layton 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 ` 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 ` 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 ` Jeff Layton [this message] 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 ` 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 2023-09-28 11:03 ` Jeff Layton 2023-09-28 11:03 ` Jeff Layton 2023-09-28 11:03 ` Jeff Layton 2023-09-28 11:03 ` Jeff Layton 2023-09-28 11:03 ` [f2fs-dev] " 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-51-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-nilfs@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.