Commit 1bc33893 authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

ext4: convert to ctime accessor functions 



In later patches, we're going to change how the inode's ctime field is
used. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-40-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent fc4eed64

fs/ext4/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ ext4_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
	error = __ext4_set_acl(handle, inode, type, acl, 0 /* xattr_flags */);

	if (!error && update_mode) {

		inode->i_mode = mode;

		inode->i_ctime = current_time(inode);

		inode_set_ctime_current(inode);

		error = ext4_mark_inode_dirty(handle, inode);

	}

out_stop:

fs/ext4/ext4.h

+48 −42
Original line number Diff line number Diff line
@@ -868,64 +868,70 @@ struct ext4_inode { 
 * affected filesystem before 2242.

 */



static inline __le32 ext4_encode_extra_time(struct timespec64 *time)

static inline __le32 ext4_encode_extra_time(struct timespec64 ts)

{

	u32 extra =((time->tv_sec - (s32)time->tv_sec) >> 32) & EXT4_EPOCH_MASK;

	return cpu_to_le32(extra | (time->tv_nsec << EXT4_EPOCH_BITS));

	u32 extra = ((ts.tv_sec - (s32)ts.tv_sec) >> 32) & EXT4_EPOCH_MASK;

	return cpu_to_le32(extra | (ts.tv_nsec << EXT4_EPOCH_BITS));

}



static inline void ext4_decode_extra_time(struct timespec64 *time,

static inline struct timespec64 ext4_decode_extra_time(__le32 base,

						       __le32 extra)

{

	struct timespec64 ts = { .tv_sec = (signed)le32_to_cpu(base) };



	if (unlikely(extra & cpu_to_le32(EXT4_EPOCH_MASK)))

		time->tv_sec += (u64)(le32_to_cpu(extra) & EXT4_EPOCH_MASK) << 32;

	time->tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;

		ts.tv_sec += (u64)(le32_to_cpu(extra) & EXT4_EPOCH_MASK) << 32;

	ts.tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;

	return ts;

}



#define EXT4_INODE_SET_XTIME(xtime, inode, raw_inode)				\

#define EXT4_INODE_SET_XTIME_VAL(xtime, inode, raw_inode, ts)			\

do {										\

	if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) {	\

		(raw_inode)->xtime = cpu_to_le32((inode)->xtime.tv_sec);	\

		(raw_inode)->xtime ## _extra =					\

				ext4_encode_extra_time(&(inode)->xtime);	\

		}								\

	else	\

		(raw_inode)->xtime = cpu_to_le32(clamp_t(int32_t, (inode)->xtime.tv_sec, S32_MIN, S32_MAX));	\

		(raw_inode)->xtime = cpu_to_le32((ts).tv_sec);			\

		(raw_inode)->xtime ## _extra = ext4_encode_extra_time(ts);	\

	} else									\

		(raw_inode)->xtime = cpu_to_le32(clamp_t(int32_t, (ts).tv_sec, S32_MIN, S32_MAX));	\

} while (0)



#define EXT4_INODE_SET_XTIME(xtime, inode, raw_inode)				\

	EXT4_INODE_SET_XTIME_VAL(xtime, inode, raw_inode, (inode)->xtime)



#define EXT4_INODE_SET_CTIME(inode, raw_inode)					\

	EXT4_INODE_SET_XTIME_VAL(i_ctime, inode, raw_inode, inode_get_ctime(inode))



#define EXT4_EINODE_SET_XTIME(xtime, einode, raw_inode)				\

do {									       \

	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))			\

		(raw_inode)->xtime = cpu_to_le32((einode)->xtime.tv_sec);      \

	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))	       \

		(raw_inode)->xtime ## _extra =				       \

				ext4_encode_extra_time(&(einode)->xtime);      \

} while (0)

		EXT4_INODE_SET_XTIME_VAL(xtime, &((einode)->vfs_inode),		\

					 raw_inode, (einode)->xtime)



#define EXT4_INODE_GET_XTIME_VAL(xtime, inode, raw_inode)			\

	(EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra) ?	\

		ext4_decode_extra_time((raw_inode)->xtime,				\

				       (raw_inode)->xtime ## _extra) :		\

		(struct timespec64) {						\

			.tv_sec = (signed)le32_to_cpu((raw_inode)->xtime)	\

		})



#define EXT4_INODE_GET_XTIME(xtime, inode, raw_inode)				\

do {										\

	(inode)->xtime.tv_sec = (signed)le32_to_cpu((raw_inode)->xtime);	\

	if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) {	\

		ext4_decode_extra_time(&(inode)->xtime,				\

				       raw_inode->xtime ## _extra);		\

		}								\

	else									\

		(inode)->xtime.tv_nsec = 0;					\

	(inode)->xtime = EXT4_INODE_GET_XTIME_VAL(xtime, inode, raw_inode);	\

} while (0)



#define EXT4_INODE_GET_CTIME(inode, raw_inode)					\

do {										\

	inode_set_ctime_to_ts(inode,						\

		EXT4_INODE_GET_XTIME_VAL(i_ctime, inode, raw_inode));		\

} while (0)



#define EXT4_EINODE_GET_XTIME(xtime, einode, raw_inode)				\

do {										\

	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime)) 			\

		(einode)->xtime.tv_sec = 				       \

			(signed)le32_to_cpu((raw_inode)->xtime);	       \

	else								       \

		(einode)->xtime.tv_sec = 0;				       \

	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))	       \

		ext4_decode_extra_time(&(einode)->xtime,		       \

				       raw_inode->xtime ## _extra);	       \

		(einode)->xtime =						\

			EXT4_INODE_GET_XTIME_VAL(xtime, &(einode->vfs_inode),	\

						 raw_inode);			\

	else									\

		(einode)->xtime.tv_nsec = 0;				       \

		(einode)->xtime = (struct timespec64){0, 0};			\

} while (0)



#define i_disk_version osd1.linux1.l_i_version

fs/ext4/extents.c

+6 −6
Original line number Diff line number Diff line
@@ -4476,12 +4476,12 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset, 
		map.m_lblk += ret;

		map.m_len = len = len - ret;

		epos = (loff_t)map.m_lblk << inode->i_blkbits;

		inode->i_ctime = current_time(inode);

		inode_set_ctime_current(inode);

		if (new_size) {

			if (epos > new_size)

				epos = new_size;

			if (ext4_update_inode_size(inode, epos) & 0x1)

				inode->i_mtime = inode->i_ctime;

				inode->i_mtime = inode_get_ctime(inode);

		}

		ret2 = ext4_mark_inode_dirty(handle, inode);

		ext4_update_inode_fsync_trans(handle, inode, 1);
@@ -4617,7 +4617,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 


		/* Now release the pages and zero block aligned part of pages */

		truncate_pagecache_range(inode, start, end - 1);

		inode->i_mtime = inode->i_ctime = current_time(inode);

		inode->i_mtime = inode_set_ctime_current(inode);



		ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,

					     flags);
@@ -4642,7 +4642,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		goto out_mutex;

	}



	inode->i_mtime = inode->i_ctime = current_time(inode);

	inode->i_mtime = inode_set_ctime_current(inode);

	if (new_size)

		ext4_update_inode_size(inode, new_size);

	ret = ext4_mark_inode_dirty(handle, inode);
@@ -5378,7 +5378,7 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len) 
	up_write(&EXT4_I(inode)->i_data_sem);

	if (IS_SYNC(inode))

		ext4_handle_sync(handle);

	inode->i_mtime = inode->i_ctime = current_time(inode);

	inode->i_mtime = inode_set_ctime_current(inode);

	ret = ext4_mark_inode_dirty(handle, inode);

	ext4_update_inode_fsync_trans(handle, inode, 1);
@@ -5488,7 +5488,7 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len) 
	/* Expand file to avoid data loss if there is error while shifting */

	inode->i_size += len;

	EXT4_I(inode)->i_disksize += len;

	inode->i_mtime = inode->i_ctime = current_time(inode);

	inode->i_mtime = inode_set_ctime_current(inode);

	ret = ext4_mark_inode_dirty(handle, inode);

	if (ret)

		goto out_stop;

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ struct inode *__ext4_new_inode(struct mnt_idmap *idmap, 
	inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb);

	/* This is the optimal IO size (for stat), not the fs block size */

	inode->i_blocks = 0;

	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);

	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);

	ei->i_crtime = inode->i_mtime;



	memset(ei->i_data, 0, sizeof(ei->i_data));

fs/ext4/inline.c

+2 −2
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle, 
	 * happen is that the times are slightly out of date

	 * and/or different from the directory change time.

	 */

	dir->i_mtime = dir->i_ctime = current_time(dir);

	dir->i_mtime = inode_set_ctime_current(dir);

	ext4_update_dx_flag(dir);

	inode_inc_iversion(dir);

	return 1;
@@ -1991,7 +1991,7 @@ int ext4_inline_data_truncate(struct inode *inode, int *has_inline) 
		ext4_orphan_del(handle, inode);



	if (err == 0) {

		inode->i_mtime = inode->i_ctime = current_time(inode);

		inode->i_mtime = inode_set_ctime_current(inode);

		err = ext4_mark_inode_dirty(handle, inode);

		if (IS_SYNC(inode))

			ext4_handle_sync(handle);