[02/87] fs: convert core infrastructure to new {a,m}time accessors

Message ID	20230928110413.33032-1-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: Eric Biederman <ebiederm@xmission.com>, Kees Cook <keescook@chromium.org>, linux-mm@kvack.org Subject: [PATCH 02/87] fs: convert core infrastructure to new {a,m}time accessors Date: Thu, 28 Sep 2023 07:02:11 -0400 Message-ID: <20230928110413.33032-1-jlayton@kernel.org> In-Reply-To: <20230928110300.32891-1-jlayton@kernel.org> References: <20230928110300.32891-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

diff --git a/fs/attr.c b/fs/attr.c index a8ae5f6d9b16..bdf5deb06ea9 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -308,9 +308,9 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode, i_uid_update(idmap, attr, inode); i_gid_update(idmap, attr, inode); if (ia_valid & ATTR_ATIME) - inode->i_atime = attr->ia_atime; + inode_set_atime_to_ts(inode, attr->ia_atime); if (ia_valid & ATTR_MTIME) - inode->i_mtime = attr->ia_mtime; + inode_set_mtime_to_ts(inode, attr->ia_mtime); if (ia_valid & ATTR_CTIME) inode_set_ctime_to_ts(inode, attr->ia_ctime); if (ia_valid & ATTR_MODE) { diff --git a/fs/bad_inode.c b/fs/bad_inode.c index 83f9566c973b..316d88da2ce1 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c @@ -208,7 +208,7 @@ void make_bad_inode(struct inode *inode) remove_inode_hash(inode); inode->i_mode = S_IFREG; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_op = &bad_inode_ops; inode->i_opflags &= ~IOP_XATTR; inode->i_fop = &bad_file_ops; diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index e0108d17b085..5d2be9b0a0a5 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -547,7 +547,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode) if (inode) { inode->i_ino = get_next_ino(); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); } return inode; } diff --git a/fs/inode.c b/fs/inode.c index 84bc3c76e5cc..0612ad9c0227 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1837,27 +1837,29 @@ EXPORT_SYMBOL(bmap); static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, struct timespec64 now) { - struct timespec64 ctime; + struct timespec64 atime, mtime, ctime; if (!(mnt->mnt_flags & MNT_RELATIME)) return 1; /* * Is mtime younger than or equal to atime? If yes, update atime: */ - if (timespec64_compare(&inode->i_mtime, &inode->i_atime) >= 0) + atime = inode_get_atime(inode); + mtime = inode_get_mtime(inode); + if (timespec64_compare(&mtime, &atime) >= 0) return 1; /* * Is ctime younger than or equal to atime? If yes, update atime: */ ctime = inode_get_ctime(inode); - if (timespec64_compare(&ctime, &inode->i_atime) >= 0) + if (timespec64_compare(&ctime, &atime) >= 0) return 1; /* * Is the previous atime value older than a day? If yes, * update atime: */ - if ((long)(now.tv_sec - inode->i_atime.tv_sec) >= 24*60*60) + if ((long)(now.tv_sec - atime.tv_sec) >= 24*60*60) return 1; /* * Good, we can skip the atime update: @@ -1888,12 +1890,13 @@ int inode_update_timestamps(struct inode *inode, int flags) if (flags & (S_MTIME|S_CTIME|S_VERSION)) { struct timespec64 ctime = inode_get_ctime(inode); + struct timespec64 mtime = inode_get_mtime(inode); now = inode_set_ctime_current(inode); if (!timespec64_equal(&now, &ctime)) updated |= S_CTIME; - if (!timespec64_equal(&now, &inode->i_mtime)) { - inode->i_mtime = now; + if (!timespec64_equal(&now, &mtime)) { + inode_set_mtime_to_ts(inode, now); updated |= S_MTIME; } if (IS_I_VERSION(inode) && inode_maybe_inc_iversion(inode, updated)) @@ -1903,8 +1906,10 @@ int inode_update_timestamps(struct inode *inode, int flags) } if (flags & S_ATIME) { - if (!timespec64_equal(&now, &inode->i_atime)) { - inode->i_atime = now; + struct timespec64 atime = inode_get_atime(inode); + + if (!timespec64_equal(&now, &atime)) { + inode_set_atime_to_ts(inode, now); updated |= S_ATIME; } } @@ -1963,7 +1968,7 @@ EXPORT_SYMBOL(inode_update_time); bool atime_needs_update(const struct path *path, struct inode *inode) { struct vfsmount *mnt = path->mnt; - struct timespec64 now; + struct timespec64 now, atime; if (inode->i_flags & S_NOATIME) return false; @@ -1989,7 +1994,8 @@ bool atime_needs_update(const struct path *path, struct inode *inode) if (!relatime_need_update(mnt, inode, now)) return false; - if (timespec64_equal(&inode->i_atime, &now)) + atime = inode_get_atime(inode); + if (timespec64_equal(&atime, &now)) return false; return true; @@ -2106,17 +2112,18 @@ static int inode_needs_update_time(struct inode *inode) { int sync_it = 0; struct timespec64 now = current_time(inode); - struct timespec64 ctime; + struct timespec64 ts; /* First try to exhaust all avenues to not sync */ if (IS_NOCMTIME(inode)) return 0; - if (!timespec64_equal(&inode->i_mtime, &now)) + ts = inode_get_mtime(inode); + if (!timespec64_equal(&ts, &now)) sync_it = S_MTIME; - ctime = inode_get_ctime(inode); - if (!timespec64_equal(&ctime, &now)) + ts = inode_get_ctime(inode); + if (!timespec64_equal(&ts, &now)) sync_it |= S_CTIME; if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode)) diff --git a/fs/libfs.c b/fs/libfs.c index f5cdc7f7f5b5..abe2b5a40ba1 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -541,7 +541,8 @@ void simple_recursive_removal(struct dentry *dentry, dput(victim); // unpin it } if (victim == dentry) { - inode->i_mtime = inode_set_ctime_current(inode); + inode_set_mtime_to_ts(inode, + inode_set_ctime_current(inode)); if (d_is_dir(dentry)) drop_nlink(inode); inode_unlock(inode); @@ -582,7 +583,7 @@ static int pseudo_fs_fill_super(struct super_block *s, struct fs_context *fc) */ root->i_ino = 1; root->i_mode = S_IFDIR | S_IRUSR | S_IWUSR; - root->i_atime = root->i_mtime = inode_set_ctime_current(root); + simple_inode_init_ts(root); s->s_root = d_make_root(root); if (!s->s_root) return -ENOMEM; @@ -638,8 +639,8 @@ int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *den { struct inode *inode = d_inode(old_dentry); - dir->i_mtime = inode_set_ctime_to_ts(dir, - inode_set_ctime_current(inode)); + inode_set_mtime_to_ts(dir, + inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode))); inc_nlink(inode); ihold(inode); dget(dentry); @@ -673,8 +674,8 @@ int simple_unlink(struct inode *dir, struct dentry *dentry) { struct inode *inode = d_inode(dentry); - dir->i_mtime = inode_set_ctime_to_ts(dir, - inode_set_ctime_current(inode)); + inode_set_mtime_to_ts(dir, + inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode))); drop_nlink(inode); dput(dentry); return 0; @@ -709,9 +710,10 @@ void simple_rename_timestamp(struct inode *old_dir, struct dentry *old_dentry, { struct inode *newino = d_inode(new_dentry); - old_dir->i_mtime = inode_set_ctime_current(old_dir); + inode_set_mtime_to_ts(old_dir, inode_set_ctime_current(old_dir)); if (new_dir != old_dir) - new_dir->i_mtime = inode_set_ctime_current(new_dir); + inode_set_mtime_to_ts(new_dir, + inode_set_ctime_current(new_dir)); inode_set_ctime_current(d_inode(old_dentry)); if (newino) inode_set_ctime_current(newino); @@ -926,7 +928,7 @@ int simple_fill_super(struct super_block *s, unsigned long magic, */ inode->i_ino = 1; inode->i_mode = S_IFDIR | 0755; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_op = &simple_dir_inode_operations; inode->i_fop = &simple_dir_operations; set_nlink(inode, 2); @@ -952,7 +954,7 @@ int simple_fill_super(struct super_block *s, unsigned long magic, goto out; } inode->i_mode = S_IFREG | files->mode; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_fop = files->ops; inode->i_ino = i; d_add(dentry, inode); @@ -1520,7 +1522,7 @@ struct inode *alloc_anon_inode(struct super_block *s) inode->i_uid = current_fsuid(); inode->i_gid = current_fsgid(); inode->i_flags |= S_PRIVATE; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); return inode; } EXPORT_SYMBOL(alloc_anon_inode); @@ -1920,8 +1922,12 @@ EXPORT_SYMBOL_GPL(direct_write_fallback); * When a new inode is created, most filesystems set the timestamps to the * current time. Add a helper to do this. */ -struct timespec64 simple_inode_init_ts(struct inode *inode); +struct timespec64 simple_inode_init_ts(struct inode *inode) { - return inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + struct timespec64 ts = inode_set_ctime_current(inode); + + inode_set_atime_to_ts(inode, ts); + inode_set_mtime_to_ts(inode, ts); + return ts; } EXPORT_SYMBOL(simple_inode_init_ts); diff --git a/fs/nsfs.c b/fs/nsfs.c index 647a22433bd8..9a4b228d42fa 100644 --- a/fs/nsfs.c +++ b/fs/nsfs.c @@ -84,7 +84,7 @@ static int __ns_get_path(struct path *path, struct ns_common *ns) return -ENOMEM; } inode->i_ino = ns->inum; - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_flags |= S_IMMUTABLE; inode->i_mode = S_IFREG | S_IRUGO; inode->i_fop = &ns_file_operations; diff --git a/fs/pipe.c b/fs/pipe.c index 139190165a1c..b96a5918d064 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -898,7 +898,7 @@ static struct inode * get_pipe_inode(void) inode->i_mode = S_IFIFO | S_IRUSR | S_IWUSR; inode->i_uid = current_fsuid(); inode->i_gid = current_fsgid(); - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); return inode; diff --git a/fs/stack.c b/fs/stack.c index b5e01bdb5f5f..f18920119944 100644 --- a/fs/stack.c +++ b/fs/stack.c @@ -66,8 +66,8 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src) dest->i_uid = src->i_uid; dest->i_gid = src->i_gid; dest->i_rdev = src->i_rdev; - dest->i_atime = src->i_atime; - dest->i_mtime = src->i_mtime; + inode_set_atime_to_ts(dest, inode_get_atime(src)); + inode_set_mtime_to_ts(dest, inode_get_mtime(src)); inode_set_ctime_to_ts(dest, inode_get_ctime(src)); dest->i_blkbits = src->i_blkbits; dest->i_flags = src->i_flags; diff --git a/fs/stat.c b/fs/stat.c index d43a5cc1bfa4..24bb0209e459 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -57,8 +57,8 @@ void generic_fillattr(struct mnt_idmap *idmap, u32 request_mask, stat->gid = vfsgid_into_kgid(vfsgid); stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); - stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; + stat->atime = inode_get_atime(inode); + stat->mtime = inode_get_mtime(inode); stat->ctime = inode_get_ctime(inode); stat->blksize = i_blocksize(inode); stat->blocks = inode->i_blocks; diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h index 010d39d0dc1c..2b1f74b24070 100644 --- a/include/linux/fs_stack.h +++ b/include/linux/fs_stack.h @@ -16,14 +16,14 @@ extern void fsstack_copy_inode_size(struct inode *dst, struct inode *src); static inline void fsstack_copy_attr_atime(struct inode *dest, const struct inode *src) { - dest->i_atime = src->i_atime; + inode_set_atime_to_ts(dest, inode_get_atime(src)); } static inline void fsstack_copy_attr_times(struct inode *dest, const struct inode *src) { - dest->i_atime = src->i_atime; - dest->i_mtime = src->i_mtime; + inode_set_atime_to_ts(dest, inode_get_atime(src)); + inode_set_mtime_to_ts(dest, inode_get_mtime(src)); inode_set_ctime_to_ts(dest, inode_get_ctime(src)); }

[02/87] fs: convert core infrastructure to new {a,m}time accessors

Commit Message

Patch