[v2,39/89] fuse: convert to new timestamp accessors

Message ID	20231004185347.80880-37-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 Subject: [PATCH v2 39/89] fuse: convert to new timestamp accessors Date: Wed, 4 Oct 2023 14:52:24 -0400 Message-ID: <20231004185347.80880-37-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-37-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
Subject: [PATCH v2 39/89] fuse: convert to new timestamp accessors
Date: Wed,  4 Oct 2023 14:52:24 -0400
Message-ID: <20231004185347.80880-37-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/fuse/control.c |  2 +-
 fs/fuse/dir.c     | 10 +++++-----
 fs/fuse/inode.c   | 29 ++++++++++++++---------------
 fs/fuse/readdir.c |  6 ++++--
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/fs/fuse/control.c b/fs/fuse/control.c
index ab62e4624256..284a35006462 100644
--- a/fs/fuse/control.c
+++ b/fs/fuse/control.c
@@ -235,7 +235,7 @@  static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,
 	inode->i_mode = mode;
 	inode->i_uid = fc->user_id;
 	inode->i_gid = fc->group_id;
-	inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+	simple_inode_init_ts(inode);
 	/* setting ->i_op to NULL is not allowed */
 	if (iop)
 		inode->i_op = iop;
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index d707e6987da9..d19cbf34c634 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1812,12 +1812,12 @@  int fuse_flush_times(struct inode *inode, struct fuse_file *ff)
 	memset(&outarg, 0, sizeof(outarg));
 
 	inarg.valid = FATTR_MTIME;
-	inarg.mtime = inode->i_mtime.tv_sec;
-	inarg.mtimensec = inode->i_mtime.tv_nsec;
+	inarg.mtime = inode_get_mtime_sec(inode);
+	inarg.mtimensec = inode_get_mtime_nsec(inode);
 	if (fm->fc->minor >= 23) {
 		inarg.valid |= FATTR_CTIME;
-		inarg.ctime = inode_get_ctime(inode).tv_sec;
-		inarg.ctimensec = inode_get_ctime(inode).tv_nsec;
+		inarg.ctime = inode_get_ctime_sec(inode);
+		inarg.ctimensec = inode_get_ctime_nsec(inode);
 	}
 	if (ff) {
 		inarg.valid |= FATTR_FH;
@@ -1956,7 +1956,7 @@  int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,
 	/* the kernel maintains i_mtime locally */
 	if (trust_local_cmtime) {
 		if (attr->ia_valid & ATTR_MTIME)
-			inode->i_mtime = attr->ia_mtime;
+			inode_set_mtime_to_ts(inode, attr->ia_mtime);
 		if (attr->ia_valid & ATTR_CTIME)
 			inode_set_ctime_to_ts(inode, attr->ia_ctime);
 		/* FIXME: clear I_DIRTY_SYNC? */
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 444418e240c8..f78fbf33f8a0 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -188,12 +188,10 @@  void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr,
 	attr->mtimensec = min_t(u32, attr->mtimensec, NSEC_PER_SEC - 1);
 	attr->ctimensec = min_t(u32, attr->ctimensec, NSEC_PER_SEC - 1);
 
-	inode->i_atime.tv_sec   = attr->atime;
-	inode->i_atime.tv_nsec  = attr->atimensec;
+	inode_set_atime(inode, attr->atime, attr->atimensec);
 	/* mtime from server may be stale due to local buffered write */
 	if (!(cache_mask & STATX_MTIME)) {
-		inode->i_mtime.tv_sec   = attr->mtime;
-		inode->i_mtime.tv_nsec  = attr->mtimensec;
+		inode_set_mtime(inode, attr->mtime, attr->mtimensec);
 	}
 	if (!(cache_mask & STATX_CTIME)) {
 		inode_set_ctime(inode, attr->ctime, attr->ctimensec);
@@ -276,12 +274,12 @@  void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
 		attr->size = i_size_read(inode);
 
 	if (cache_mask & STATX_MTIME) {
-		attr->mtime = inode->i_mtime.tv_sec;
-		attr->mtimensec = inode->i_mtime.tv_nsec;
+		attr->mtime = inode_get_mtime_sec(inode);
+		attr->mtimensec = inode_get_mtime_nsec(inode);
 	}
 	if (cache_mask & STATX_CTIME) {
-		attr->ctime = inode_get_ctime(inode).tv_sec;
-		attr->ctimensec = inode_get_ctime(inode).tv_nsec;
+		attr->ctime = inode_get_ctime_sec(inode);
+		attr->ctimensec = inode_get_ctime_nsec(inode);
 	}
 
 	if ((attr_version != 0 && fi->attr_version > attr_version) ||
@@ -290,7 +288,7 @@  void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,
 		return;
 	}
 
-	old_mtime = inode->i_mtime;
+	old_mtime = inode_get_mtime(inode);
 	fuse_change_attributes_common(inode, attr, sx, attr_valid, cache_mask);
 
 	oldsize = inode->i_size;
@@ -337,8 +335,7 @@  static void fuse_init_inode(struct inode *inode, struct fuse_attr *attr,
 {
 	inode->i_mode = attr->mode & S_IFMT;
 	inode->i_size = attr->size;
-	inode->i_mtime.tv_sec  = attr->mtime;
-	inode->i_mtime.tv_nsec = attr->mtimensec;
+	inode_set_mtime(inode, attr->mtime, attr->mtimensec);
 	inode_set_ctime(inode, attr->ctime, attr->ctimensec);
 	if (S_ISREG(inode->i_mode)) {
 		fuse_init_common(inode);
@@ -1423,17 +1420,19 @@  EXPORT_SYMBOL_GPL(fuse_dev_free);
 static void fuse_fill_attr_from_inode(struct fuse_attr *attr,
 				      const struct fuse_inode *fi)
 {
+	struct timespec64 atime = inode_get_atime(&fi->inode);
+	struct timespec64 mtime = inode_get_mtime(&fi->inode);
 	struct timespec64 ctime = inode_get_ctime(&fi->inode);
 
 	*attr = (struct fuse_attr){
 		.ino		= fi->inode.i_ino,
 		.size		= fi->inode.i_size,
 		.blocks		= fi->inode.i_blocks,
-		.atime		= fi->inode.i_atime.tv_sec,
-		.mtime		= fi->inode.i_mtime.tv_sec,
+		.atime		= atime.tv_sec,
+		.mtime		= mtime.tv_sec,
 		.ctime		= ctime.tv_sec,
-		.atimensec	= fi->inode.i_atime.tv_nsec,
-		.mtimensec	= fi->inode.i_mtime.tv_nsec,
+		.atimensec	= atime.tv_nsec,
+		.mtimensec	= mtime.tv_nsec,
 		.ctimensec	= ctime.tv_nsec,
 		.mode		= fi->inode.i_mode,
 		.nlink		= fi->inode.i_nlink,
diff --git a/fs/fuse/readdir.c b/fs/fuse/readdir.c
index 9e6d587b3e67..c66a54d6c7d3 100644
--- a/fs/fuse/readdir.c
+++ b/fs/fuse/readdir.c
@@ -476,7 +476,7 @@  static int fuse_readdir_cached(struct file *file, struct dir_context *ctx)
 	if (!fi->rdc.cached) {
 		/* Starting cache? Set cache mtime. */
 		if (!ctx->pos && !fi->rdc.size) {
-			fi->rdc.mtime = inode->i_mtime;
+			fi->rdc.mtime = inode_get_mtime(inode);
 			fi->rdc.iversion = inode_query_iversion(inode);
 		}
 		spin_unlock(&fi->rdc.lock);
@@ -488,8 +488,10 @@  static int fuse_readdir_cached(struct file *file, struct dir_context *ctx)
 	 * changed, and reset the cache if so.
 	 */
 	if (!ctx->pos) {
+		struct timespec64 mtime = inode_get_mtime(inode);
+
 		if (inode_peek_iversion(inode) != fi->rdc.iversion ||
-		    !timespec64_equal(&fi->rdc.mtime, &inode->i_mtime)) {
+		    !timespec64_equal(&fi->rdc.mtime, &mtime)) {
 			fuse_rdc_reset(inode);
 			goto retry_locked;
 		}

[v2,39/89] fuse: convert to new timestamp accessors

Commit Message

Patch