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

ocfs2: 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>
Acked-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-60-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 3d65c46f

fs/ocfs2/acl.c

+3 −3
Original line number Diff line number Diff line
@@ -191,10 +191,10 @@ static int ocfs2_acl_set_mode(struct inode *inode, struct buffer_head *di_bh, 
	}



	inode->i_mode = new_mode;

	inode->i_ctime = current_time(inode);

	inode_set_ctime_current(inode);

	di->i_mode = cpu_to_le16(inode->i_mode);

	di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);

	di->i_ctime = cpu_to_le64(inode_get_ctime(inode).tv_sec);

	di->i_ctime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);

	ocfs2_update_inode_fsync_trans(handle, inode, 0);



	ocfs2_journal_dirty(handle, di_bh);

fs/ocfs2/alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -7436,10 +7436,10 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh, 
	}



	inode->i_blocks = ocfs2_inode_sector_count(inode);

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

	inode->i_mtime = inode_set_ctime_current(inode);



	di->i_ctime = di->i_mtime = cpu_to_le64(inode->i_ctime.tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);

	di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime(inode).tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime(inode).tv_nsec);



	ocfs2_update_inode_fsync_trans(handle, inode, 1);

	ocfs2_journal_dirty(handle, di_bh);

fs/ocfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -2048,7 +2048,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, 
		}

		inode->i_blocks = ocfs2_inode_sector_count(inode);

		di->i_size = cpu_to_le64((u64)i_size_read(inode));

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

		inode->i_mtime = inode_set_ctime_current(inode);

		di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);

		di->i_mtime_nsec = di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);

		if (handle)

fs/ocfs2/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ int __ocfs2_add_entry(handle_t *handle, 
				offset, ocfs2_dir_trailer_blk_off(dir->i_sb));



		if (ocfs2_dirent_would_fit(de, rec_len)) {

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

			dir->i_mtime = inode_set_ctime_current(dir);

			retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);

			if (retval < 0) {

				mlog_errno(retval);
@@ -2962,11 +2962,11 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	ocfs2_dinode_new_extent_list(dir, di);



	i_size_write(dir, sb->s_blocksize);

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

	dir->i_mtime = inode_set_ctime_current(dir);



	di->i_size = cpu_to_le64(sb->s_blocksize);

	di->i_ctime = di->i_mtime = cpu_to_le64(dir->i_ctime.tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(dir->i_ctime.tv_nsec);

	di->i_ctime = di->i_mtime = cpu_to_le64(inode_get_ctime(dir).tv_sec);

	di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(inode_get_ctime(dir).tv_nsec);

	ocfs2_update_inode_fsync_trans(handle, dir, 1);



	/*

fs/ocfs2/dlmfs/dlmfs.c

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb) 
	if (inode) {

		inode->i_ino = get_next_ino();

		inode_init_owner(&nop_mnt_idmap, inode, NULL, mode);

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

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

		inc_nlink(inode);



		inode->i_fop = &simple_dir_operations;
@@ -360,7 +360,7 @@ static struct inode *dlmfs_get_inode(struct inode *parent, 


	inode->i_ino = get_next_ino();

	inode_init_owner(&nop_mnt_idmap, inode, parent, mode);

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

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



	ip = DLMFS_I(inode);

	ip->ip_conn = DLMFS_I(parent)->ip_conn;