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

ext2: 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>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-39-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent f29f1908

fs/ext2/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ ext2_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
	error = __ext2_set_acl(inode, acl, type);

	if (!error && update_mode) {

		inode->i_mode = mode;

		inode->i_ctime = current_time(inode);

		inode_set_ctime_current(inode);

		mark_inode_dirty(inode);

	}

	return error;

fs/ext2/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ int ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de, 
	ext2_set_de_type(de, inode);

	ext2_commit_chunk(page, pos, len);

	if (update_times)

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

		dir->i_mtime = inode_set_ctime_current(dir);

	EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;

	mark_inode_dirty(dir);

	return ext2_handle_dirsync(dir);
@@ -555,7 +555,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode) 
	de->inode = cpu_to_le32(inode->i_ino);

	ext2_set_de_type (de, inode);

	ext2_commit_chunk(page, pos, rec_len);

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

	dir->i_mtime = inode_set_ctime_current(dir);

	EXT2_I(dir)->i_flags &= ~EXT2_BTREE_FL;

	mark_inode_dirty(dir);

	err = ext2_handle_dirsync(dir);
@@ -606,7 +606,7 @@ int ext2_delete_entry(struct ext2_dir_entry_2 *dir, struct page *page) 
		pde->rec_len = ext2_rec_len_to_disk(to - from);

	dir->inode = 0;

	ext2_commit_chunk(page, pos, to - from);

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

	inode->i_mtime = inode_set_ctime_current(inode);

	EXT2_I(inode)->i_flags &= ~EXT2_BTREE_FL;

	mark_inode_dirty(inode);

	return ext2_handle_dirsync(inode);

fs/ext2/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ struct inode *ext2_new_inode(struct inode *dir, umode_t mode, 


	inode->i_ino = ino;

	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);

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

	ei->i_flags =

		ext2_mask_flags(mode, EXT2_I(dir)->i_flags & EXT2_FL_INHERITED);

fs/ext2/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static void ext2_splice_branch(struct inode *inode, 
	if (where->bh)

		mark_buffer_dirty_inode(where->bh, inode);



	inode->i_ctime = current_time(inode);

	inode_set_ctime_current(inode);

	mark_inode_dirty(inode);

}
@@ -1287,7 +1287,7 @@ static int ext2_setsize(struct inode *inode, loff_t newsize) 
	__ext2_truncate_blocks(inode, newsize);

	filemap_invalidate_unlock(inode->i_mapping);



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

	inode->i_mtime = inode_set_ctime_current(inode);

	if (inode_needs_sync(inode)) {

		sync_mapping_buffers(inode->i_mapping);

		sync_inode_metadata(inode, 1);
@@ -1409,9 +1409,9 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) 
	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));

	inode->i_size = le32_to_cpu(raw_inode->i_size);

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

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

	inode_set_ctime(inode, (signed)le32_to_cpu(raw_inode->i_ctime), 0);

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

	inode->i_atime.tv_nsec = inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = 0;

	inode->i_atime.tv_nsec = inode->i_mtime.tv_nsec = 0;

	ei->i_dtime = le32_to_cpu(raw_inode->i_dtime);

	/* We now have enough fields to check if the inode was active or not.

	 * This is needed because nfsd might try to access dead inodes
@@ -1541,7 +1541,7 @@ static int __ext2_write_inode(struct inode *inode, int do_sync) 
	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);

	raw_inode->i_size = cpu_to_le32(inode->i_size);

	raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);

	raw_inode->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);

	raw_inode->i_ctime = cpu_to_le32(inode_get_ctime(inode).tv_sec);

	raw_inode->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);



	raw_inode->i_blocks = cpu_to_le32(inode->i_blocks);

fs/ext2/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int ext2_fileattr_set(struct mnt_idmap *idmap, 
		(fa->flags & EXT2_FL_USER_MODIFIABLE);



	ext2_set_inode_flags(inode);

	inode->i_ctime = current_time(inode);

	inode_set_ctime_current(inode);

	mark_inode_dirty(inode);



	return 0;
@@ -77,7 +77,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		}



		inode_lock(inode);

		inode->i_ctime = current_time(inode);

		inode_set_ctime_current(inode);

		inode->i_generation = generation;

		inode_unlock(inode);