[v2,55/89] ntfs3: convert to new timestamp accessors

Message ID	20231004185347.80880-53-jlayton@kernel.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-fsdevel-owner@vger.kernel.org> 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: ntfs3@lists.linux.dev Subject: [PATCH v2 55/89] ntfs3: convert to new timestamp accessors Date: Wed, 4 Oct 2023 14:52:40 -0400 Message-ID: <20231004185347.80880-53-jlayton@kernel.org> In-Reply-To: <20231004185347.80880-1-jlayton@kernel.org> References: <20231004185221.80802-1-jlayton@kernel.org> <20231004185347.80880-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	fs: new accessor methods for inode atime and mtime \| expand [v2,00/89] fs: new accessor methods for inode atime and mtime [v2,03/89] spufs: convert to new timestamp accessors [v2,04/89] hypfs: convert to new timestamp accessors [v2,05/89] android: convert to new timestamp accessors [v2,06/89] char: convert to new timestamp accessors [v2,07/89] qib: convert to new timestamp accessors [v2,08/89] ibmasm: convert to new timestamp accessors [v2,09/89] misc: convert to new timestamp accessors [v2,10/89] x86: convert to new timestamp accessors [v2,11/89] tty: convert to new timestamp accessors [v2,12/89] function: convert to new timestamp accessors [v2,13/89] legacy: convert to new timestamp accessors [v2,14/89] usb: convert to new timestamp accessors [v2,15/89] 9p: convert to new timestamp accessors [v2,16/89] adfs: convert to new timestamp accessors [v2,17/89] affs: convert to new timestamp accessors [v2,18/89] afs: convert to new timestamp accessors [v2,19/89] autofs: convert to new timestamp accessors [v2,20/89] bcachefs: convert to new timestamp accessors [v2,21/89] befs: convert to new timestamp accessors [v2,22/89] bfs: convert to new timestamp accessors [v2,23/89] btrfs: convert to new timestamp accessors [v2,24/89] ceph: convert to new timestamp accessors [v2,25/89] coda: convert to new timestamp accessors [v2,26/89] configfs: convert to new timestamp accessors [v2,27/89] cramfs: convert to new timestamp accessors [v2,28/89] debugfs: convert to new timestamp accessors [v2,29/89] devpts: convert to new timestamp accessors [v2,30/89] efivarfs: convert to new timestamp accessors [v2,31/89] efs: convert to new timestamp accessors [v2,32/89] erofs: convert to new timestamp accessors [v2,33/89] exfat: convert to new timestamp accessors [v2,34/89] ext2: convert to new timestamp accessors [v2,35/89] ext4: convert to new timestamp accessors [v2,36/89] f2fs: convert to new timestamp accessors [v2,37/89] fat: convert to new timestamp accessors [v2,38/89] freevxfs: convert to new timestamp accessors [v2,39/89] fuse: convert to new timestamp accessors [v2,40/89] gfs2: convert to new timestamp accessors [v2,41/89] hfs: convert to new timestamp accessors [v2,42/89] hfsplus: convert to new timestamp accessors [v2,43/89] hostfs: convert to new timestamp accessors [v2,44/89] hpfs: convert to new timestamp accessors [v2,45/89] hugetlbfs: convert to new timestamp accessors [v2,46/89] isofs: convert to new timestamp accessors [v2,47/89] jffs2: convert to new timestamp accessors [v2,48/89] jfs: convert to new timestamp accessors [v2,49/89] kernfs: convert to new timestamp accessors [v2,50/89] minix: convert to new timestamp accessors [v2,51/89] nfs: convert to new timestamp accessors [v2,52/89] nfsd: convert to new timestamp accessors [v2,01/89] fs: new accessor methods for atime and mtime [v2,02/89] fs: convert core infrastructure to new timestamp accessors [v2,53/89] nilfs2: convert to new timestamp accessors [v2,54/89] ntfs: convert to new timestamp accessors [v2,55/89] ntfs3: convert to new timestamp accessors [v2,56/89] ocfs2: convert to new timestamp accessors [v2,57/89] omfs: convert to new timestamp accessors [v2,58/89] openpromfs: convert to new timestamp accessors [v2,59/89] orangefs: convert to new timestamp accessors [v2,60/89] overlayfs: convert to new timestamp accessors [v2,61/89] proc: convert to new timestamp accessors [v2,62/89] pstore: convert to new timestamp accessors [v2,63/89] qnx4: convert to new timestamp accessors [v2,64/89] qnx6: convert to new timestamp accessors [v2,65/89] ramfs: convert to new timestamp accessors [v2,66/89] reiserfs: convert to new timestamp accessors [v2,67/89] romfs: convert to new timestamp accessors [v2,68/89] client: convert to new timestamp accessors [v2,69/89] server: convert to new timestamp accessors [v2,70/89] squashfs: convert to new timestamp accessors [v2,71/89] sysv: convert to new timestamp accessors [v2,72/89] tracefs: convert to new timestamp accessors [v2,73/89] ubifs: convert to new timestamp accessors [v2,74/89] udf: convert to new timestamp accessors [v2,75/89] ufs: convert to new timestamp accessors [v2,76/89] vboxsf: convert to new timestamp accessors [v2,77/89] xfs: convert to new timestamp accessors [v2,78/89] zonefs: convert to new timestamp accessors [v2,79/89] linux: convert to new timestamp accessors [v2,80/89] ipc: convert to new timestamp accessors [v2,81/89] bpf: convert to new timestamp accessors [v2,82/89] mm: convert to new timestamp accessors [v2,83/89] sunrpc: convert to new timestamp accessors [v2,84/89] apparmor: convert to new timestamp accessors [v2,85/89] selinux: convert to new timestamp accessors [v2,86/89] security: convert to new timestamp accessors [v2,87/89] fs: rename inode i_atime and i_mtime fields [v2,88/89] fs: switch timespec64 fields in inode to discrete integers [v2,89/89] fs: move i_generation into new hole created after timestamp conversion

Message ID

20231004185347.80880-53-jlayton@kernel.org (mailing list archive)

State

New, archived

Headers

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: ntfs3@lists.linux.dev
Subject: [PATCH v2 55/89] ntfs3: convert to new timestamp accessors
Date: Wed,  4 Oct 2023 14:52:40 -0400
Message-ID: <20231004185347.80880-53-jlayton@kernel.org>
In-Reply-To: <20231004185347.80880-1-jlayton@kernel.org>
References: <20231004185221.80802-1-jlayton@kernel.org>
 <20231004185347.80880-1-jlayton@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

fs: new accessor methods for inode atime and mtime | expand

Commit Message

Jeff Layton Oct. 4, 2023, 6:52 p.m. UTC

Convert to using the new inode timestamp accessor functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/ntfs3/file.c    |  6 +++---
 fs/ntfs3/frecord.c | 11 +++++++----
 fs/ntfs3/inode.c   | 25 +++++++++++++++----------
 fs/ntfs3/namei.c   |  4 ++--
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index 1f7a194983c5..ad4a70b5d432 100644
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -342,7 +342,7 @@  static int ntfs_extend(struct inode *inode, loff_t pos, size_t count,
 		err = 0;
 	}
 
-	inode->i_mtime = inode_set_ctime_current(inode);
+	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 	mark_inode_dirty(inode);
 
 	if (IS_SYNC(inode)) {
@@ -400,7 +400,7 @@  static int ntfs_truncate(struct inode *inode, loff_t new_size)
 	ni_unlock(ni);
 
 	ni->std_fa |= FILE_ATTRIBUTE_ARCHIVE;
-	inode->i_mtime = inode_set_ctime_current(inode);
+	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 	if (!IS_DIRSYNC(inode)) {
 		dirty = 1;
 	} else {
@@ -642,7 +642,7 @@  static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
 		filemap_invalidate_unlock(mapping);
 
 	if (!err) {
-		inode->i_mtime = inode_set_ctime_current(inode);
+		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 		mark_inode_dirty(inode);
 	}
 
diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index dad976a68985..3df2d9e34b91 100644
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -3271,7 +3271,7 @@  int ni_write_inode(struct inode *inode, int sync, const char *hint)
 	if (is_rec_inuse(ni->mi.mrec) &&
 	    !(sbi->flags & NTFS_FLAGS_LOG_REPLAYING) && inode->i_nlink) {
 		bool modified = false;
-		struct timespec64 ctime = inode_get_ctime(inode);
+		struct timespec64 ts;
 
 		/* Update times in standard attribute. */
 		std = ni_std(ni);
@@ -3281,19 +3281,22 @@  int ni_write_inode(struct inode *inode, int sync, const char *hint)
 		}
 
 		/* Update the access times if they have changed. */
-		dup.m_time = kernel2nt(&inode->i_mtime);
+		ts = inode_get_mtime(inode);
+		dup.m_time = kernel2nt(&ts);
 		if (std->m_time != dup.m_time) {
 			std->m_time = dup.m_time;
 			modified = true;
 		}
 
-		dup.c_time = kernel2nt(&ctime);
+		ts = inode_get_mtime(inode);
+		dup.c_time = kernel2nt(&ts);
 		if (std->c_time != dup.c_time) {
 			std->c_time = dup.c_time;
 			modified = true;
 		}
 
-		dup.a_time = kernel2nt(&inode->i_atime);
+		ts = inode_get_atime(inode);
+		dup.a_time = kernel2nt(&ts);
 		if (std->a_time != dup.a_time) {
 			std->a_time = dup.a_time;
 			modified = true;
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index d6d021e19aaa..5e3d71374918 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -44,7 +44,7 @@  static struct inode *ntfs_read_mft(struct inode *inode,
 	u64 t64;
 	struct MFT_REC *rec;
 	struct runs_tree *run;
-	struct timespec64 ctime;
+	struct timespec64 ts;
 
 	inode->i_op = NULL;
 	/* Setup 'uid' and 'gid' */
@@ -169,10 +169,12 @@  static struct inode *ntfs_read_mft(struct inode *inode,
 #ifdef STATX_BTIME
 		nt2kernel(std5->cr_time, &ni->i_crtime);
 #endif
-		nt2kernel(std5->a_time, &inode->i_atime);
-		nt2kernel(std5->c_time, &ctime);
-		inode_set_ctime_to_ts(inode, ctime);
-		nt2kernel(std5->m_time, &inode->i_mtime);
+		nt2kernel(std5->a_time, &ts);
+		inode_set_atime_to_ts(inode, ts);
+		nt2kernel(std5->c_time, &ts);
+		inode_set_ctime_to_ts(inode, ts);
+		nt2kernel(std5->m_time, &ts);
+		inode_set_mtime_to_ts(inode, ts);
 
 		ni->std_fa = std5->fa;
 
@@ -960,7 +962,8 @@  int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
 
 	if (err >= 0) {
 		if (!(ni->std_fa & FILE_ATTRIBUTE_ARCHIVE)) {
-			inode->i_mtime = inode_set_ctime_current(inode);
+			inode_set_mtime_to_ts(inode,
+					      inode_set_ctime_current(inode));
 			ni->std_fa |= FILE_ATTRIBUTE_ARCHIVE;
 			dirty = true;
 		}
@@ -1660,9 +1663,11 @@  struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
 	d_instantiate(dentry, inode);
 
 	/* Set original time. inode times (i_ctime) may be changed in ntfs_init_acl. */
-	inode->i_atime = inode->i_mtime =
-		inode_set_ctime_to_ts(inode, ni->i_crtime);
-	dir->i_mtime = inode_set_ctime_to_ts(dir, ni->i_crtime);
+	inode_set_atime_to_ts(inode, ni->i_crtime);
+	inode_set_ctime_to_ts(inode, ni->i_crtime);
+	inode_set_mtime_to_ts(inode, ni->i_crtime);
+	inode_set_mtime_to_ts(dir, ni->i_crtime);
+	inode_set_ctime_to_ts(dir, ni->i_crtime);
 
 	mark_inode_dirty(dir);
 	mark_inode_dirty(inode);
@@ -1768,7 +1773,7 @@  int ntfs_unlink_inode(struct inode *dir, const struct dentry *dentry)
 
 	if (!err) {
 		drop_nlink(inode);
-		dir->i_mtime = inode_set_ctime_current(dir);
+		inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
 		mark_inode_dirty(dir);
 		inode_set_ctime_to_ts(inode, inode_get_ctime(dir));
 		if (inode->i_nlink)
diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
index eedacf94edd8..ee3093be5170 100644
--- a/fs/ntfs3/namei.c
+++ b/fs/ntfs3/namei.c
@@ -156,8 +156,8 @@  static int ntfs_link(struct dentry *ode, struct inode *dir, struct dentry *de)
 	err = ntfs_link_inode(inode, de);
 
 	if (!err) {
-		dir->i_mtime = inode_set_ctime_to_ts(
-			inode, inode_set_ctime_current(dir));
+		inode_set_ctime_current(inode);
+		inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
 		mark_inode_dirty(inode);
 		mark_inode_dirty(dir);
 		d_instantiate(de, inode);

[v2,55/89] ntfs3: convert to new timestamp accessors

Commit Message

Patch