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

jfs: 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.

Acked-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-53-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent d8b23c61

fs/jfs/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ int jfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
	if (!rc) {

		if (update_mode) {

			inode->i_mode = mode;

			inode->i_ctime = current_time(inode);

			inode_set_ctime_current(inode);

			mark_inode_dirty(inode);

		}

		rc = txCommit(tid, 1, &inode, 0);

fs/jfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ void jfs_truncate_nolock(struct inode *ip, loff_t length) 
			break;

		}



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

		ip->i_mtime = inode_set_ctime_current(ip);

		mark_inode_dirty(ip);



		txCommit(tid, 1, &ip, 0);

fs/jfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int jfs_fileattr_set(struct mnt_idmap *idmap, 
	jfs_inode->mode2 = flags;



	jfs_set_inode_flags(inode);

	inode->i_ctime = current_time(inode);

	inode_set_ctime_current(inode);

	mark_inode_dirty(inode);



	return 0;

fs/jfs/jfs_imap.c

+4 −4
Original line number Diff line number Diff line
@@ -3064,8 +3064,8 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip) 
	ip->i_atime.tv_nsec = le32_to_cpu(dip->di_atime.tv_nsec);

	ip->i_mtime.tv_sec = le32_to_cpu(dip->di_mtime.tv_sec);

	ip->i_mtime.tv_nsec = le32_to_cpu(dip->di_mtime.tv_nsec);

	ip->i_ctime.tv_sec = le32_to_cpu(dip->di_ctime.tv_sec);

	ip->i_ctime.tv_nsec = le32_to_cpu(dip->di_ctime.tv_nsec);

	inode_set_ctime(ip, le32_to_cpu(dip->di_ctime.tv_sec),

			le32_to_cpu(dip->di_ctime.tv_nsec));

	ip->i_blocks = LBLK2PBLK(ip->i_sb, le64_to_cpu(dip->di_nblocks));

	ip->i_generation = le32_to_cpu(dip->di_gen);
@@ -3139,8 +3139,8 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip) 


	dip->di_atime.tv_sec = cpu_to_le32(ip->i_atime.tv_sec);

	dip->di_atime.tv_nsec = cpu_to_le32(ip->i_atime.tv_nsec);

	dip->di_ctime.tv_sec = cpu_to_le32(ip->i_ctime.tv_sec);

	dip->di_ctime.tv_nsec = cpu_to_le32(ip->i_ctime.tv_nsec);

	dip->di_ctime.tv_sec = cpu_to_le32(inode_get_ctime(ip).tv_sec);

	dip->di_ctime.tv_nsec = cpu_to_le32(inode_get_ctime(ip).tv_nsec);

	dip->di_mtime.tv_sec = cpu_to_le32(ip->i_mtime.tv_sec);

	dip->di_mtime.tv_nsec = cpu_to_le32(ip->i_mtime.tv_nsec);

	dip->di_ixpxd = jfs_ip->ixpxd;	/* in-memory pxd's are little-endian */

fs/jfs/jfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ struct inode *ialloc(struct inode *parent, umode_t mode) 
	jfs_inode->mode2 |= inode->i_mode;



	inode->i_blocks = 0;

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

	jfs_inode->otime = inode->i_ctime.tv_sec;

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

	jfs_inode->otime = inode_get_ctime(inode).tv_sec;

	inode->i_generation = JFS_SBI(sb)->gengen++;



	jfs_inode->cflag = 0;