[54/87] fs/ntfs3: convert to new inode {a,m}time accessors

Message ID	20230928110413.33032-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 54/87] fs/ntfs3: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:03:03 -0400 Message-ID: <20230928110413.33032-53-jlayton@kernel.org> In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org> References: <20230928110300.32891-1-jlayton@kernel.org> <20230928110413.33032-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	fs: new accessor methods for atime and mtime \| expand [00/87] fs: new accessor methods for atime and mtime [02/87] fs: convert core infrastructure to new {a,m}time accessors [03/87] arch/powerpc/platforms/cell/spufs: convert to new inode {a,m}time accessors [04/87] arch/s390/hypfs: convert to new inode {a,m}time accessors [05/87] drivers/android: convert to new inode {a,m}time accessors [06/87] drivers/char: convert to new inode {a,m}time accessors [07/87] drivers/infiniband/hw/qib: convert to new inode {a,m}time accessors [08/87] drivers/misc/ibmasm: convert to new inode {a,m}time accessors [09/87] drivers/misc: convert to new inode {a,m}time accessors [10/87] drivers/platform/x86: convert to new inode {a,m}time accessors [11/87] drivers/tty: convert to new inode {a,m}time accessors [12/87] drivers/usb/core: convert to new inode {a,m}time accessors [13/87] drivers/usb/gadget/function: convert to new inode {a,m}time accessors [14/87] drivers/usb/gadget/legacy: convert to new inode {a,m}time accessors [15/87] fs/9p: convert to new inode {a,m}time accessors [16/87] fs/adfs: convert to new inode {a,m}time accessors [17/87] fs/affs: convert to new inode {a,m}time accessors [18/87] fs/afs: convert to new inode {a,m}time accessors [19/87] fs/autofs: convert to new inode {a,m}time accessors [20/87] fs/befs: convert to new inode {a,m}time accessors [21/87] fs/bfs: convert to new inode {a,m}time accessors [22/87] fs/btrfs: convert to new inode {a,m}time accessors [23/87] fs/ceph: convert to new inode {a,m}time accessors [24/87] fs/coda: convert to new inode {a,m}time accessors [25/87] fs/configfs: convert to new inode {a,m}time accessors [26/87] fs/cramfs: convert to new inode {a,m}time accessors [27/87] fs/debugfs: convert to new inode {a,m}time accessors [28/87] fs/devpts: convert to new inode {a,m}time accessors [29/87] fs/efivarfs: convert to new inode {a,m}time accessors [30/87] fs/efs: convert to new inode {a,m}time accessors [31/87] fs/erofs: convert to new inode {a,m}time accessors [32/87] fs/exfat: convert to new inode {a,m}time accessors [33/87] fs/ext2: convert to new inode {a,m}time accessors [34/87] fs/ext4: convert to new inode {a,m}time accessors [35/87] fs/f2fs: convert to new inode {a,m}time accessors [36/87] fs/fat: convert to new inode {a,m}time accessors [37/87] fs/freevxfs: convert to new inode {a,m}time accessors [38/87] fs/fuse: convert to new inode {a,m}time accessors [39/87] fs/gfs2: convert to new inode {a,m}time accessors [40/87] fs/hfs: convert to new inode {a,m}time accessors [41/87] fs/hfsplus: convert to new inode {a,m}time accessors [42/87] fs/hostfs: convert to new inode {a,m}time accessors [43/87] fs/hpfs: convert to new inode {a,m}time accessors [44/87] fs/hugetlbfs: convert to new inode {a,m}time accessors [45/87] fs/isofs: convert to new inode {a,m}time accessors [46/87] fs/jffs2: convert to new inode {a,m}time accessors [47/87] fs/jfs: convert to new inode {a,m}time accessors [48/87] fs/kernfs: convert to new inode {a,m}time accessors [49/87] fs/minix: convert to new inode {a,m}time accessors [50/87] fs/nfs: convert to new inode {a,m}time accessors [01/87] fs: new accessor methods for atime and mtime [51/87] fs/nfsd: convert to new inode {a,m}time accessors [52/87] fs/nilfs2: convert to new inode {a,m}time accessors [53/87] fs/ntfs: convert to new inode {a,m}time accessors [54/87] fs/ntfs3: convert to new inode {a,m}time accessors [55/87] fs/ocfs2: convert to new inode {a,m}time accessors [56/87] fs/omfs: convert to new inode {a,m}time accessors [57/87] fs/openpromfs: convert to new inode {a,m}time accessors [58/87] fs/orangefs: convert to new inode {a,m}time accessors [59/87] fs/overlayfs: convert to new inode {a,m}time accessors [60/87] fs/proc: convert to new inode {a,m}time accessors [61/87] fs/pstore: convert to new inode {a,m}time accessors [62/87] fs/qnx4: convert to new inode {a,m}time accessors [63/87] fs/qnx6: convert to new inode {a,m}time accessors [64/87] fs/ramfs: convert to new inode {a,m}time accessors [65/87] fs/reiserfs: convert to new inode {a,m}time accessors [66/87] fs/romfs: convert to new inode {a,m}time accessors [67/87] fs/smb/client: convert to new inode {a,m}time accessors [68/87] fs/smb/server: convert to new inode {a,m}time accessors [69/87] fs/squashfs: convert to new inode {a,m}time accessors [70/87] fs/sysv: convert to new inode {a,m}time accessors [71/87] fs/tracefs: convert to new inode {a,m}time accessors [72/87] fs/ubifs: convert to new inode {a,m}time accessors [73/87] fs/udf: convert to new inode {a,m}time accessors [74/87] fs/ufs: convert to new inode {a,m}time accessors [75/87] fs/vboxsf: convert to new inode {a,m}time accessors [76/87] fs/xfs: convert to new inode {a,m}time accessors [77/87] fs/zonefs: convert to new inode {a,m}time accessors [78/87] ipc: convert to new inode {a,m}time accessors [79/87] kernel/bpf: convert to new inode {a,m}time accessors [80/87] mm: convert to new inode {a,m}time accessors [81/87] net/sunrpc: convert to new inode {a,m}time accessors [82/87] security/apparmor: convert to new inode {a,m}time accessors [83/87] security/selinux: convert to new inode {a,m}time accessors [84/87] security: convert to new inode {a,m}time accessors [85/87] fs: rename i_atime and i_mtime fields to __i_atime and __i_mtime [86/87] fs: switch timespec64 fields in inode to discrete integers [87/87] fs: move i_blocks up a few places in struct inode

Message ID

20230928110413.33032-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 54/87] fs/ntfs3: convert to new inode {a,m}time accessors
Date: Thu, 28 Sep 2023 07:03:03 -0400
Message-ID: <20230928110413.33032-53-jlayton@kernel.org>
In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org>
References: <20230928110300.32891-1-jlayton@kernel.org>
 <20230928110413.33032-1-jlayton@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

fs: new accessor methods for atime and mtime | expand

Commit Message

Jeff Layton Sept. 28, 2023, 11:03 a.m. UTC

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

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index 962f12ce6c0a..322fb960ba5d 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 2b85cb10f0be..9f66dcf5da8f 100644
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -3265,7 +3265,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);
@@ -3275,19 +3275,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 eb2ed0701495..27fb4255f428 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);
-		ctime = inode_get_ctime(inode);
-		nt2kernel(std5->c_time, &ctime);
-		nt2kernel(std5->m_time, &inode->i_mtime);
+		ts = inode_get_atime(inode);
+		nt2kernel(std5->a_time, &ts);
+		ts = inode_get_ctime(inode);
+		nt2kernel(std5->c_time, &ts);
+		ts = inode_get_mtime(inode);
+		nt2kernel(std5->m_time, &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,8 +1663,9 @@  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_mtime_to_ts(inode,
+			      inode_set_atime_to_ts(inode, inode_set_ctime_to_ts(inode, ni->i_crtime)));
+	inode_set_mtime_to_ts(dir, inode_set_ctime_to_ts(dir, ni->i_crtime));
 
 	mark_inode_dirty(dir);
 	mark_inode_dirty(inode);
@@ -1767,7 +1771,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 ad430d50bd79..4052edb726ee 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_mtime_to_ts(dir,
+				      inode_set_ctime_to_ts(inode, inode_set_ctime_current(dir)));
 		mark_inode_dirty(inode);
 		mark_inode_dirty(dir);
 		d_instantiate(de, inode);

[54/87] fs/ntfs3: convert to new inode {a,m}time accessors

Commit Message

Patch