Unverified Commit f798accd authored by Christian Brauner's avatar Christian Brauner
Browse files

Revert "xfs: switch to multigrain timestamps" 



This reverts commit e44df266.

Users reported regressions due to enabling multi-grained timestamps
unconditionally. As no clear consensus on a solution has come up and the
discussion has gone back to the drawing board revert the infrastructure
changes for. If it isn't code that's here to stay, make it go away.

Message-ID: <20230920-keine-eile-c9755b5825db@brauner>
Acked-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent db58b5ee

fs/xfs/libxfs/xfs_trans_inode.c

+3 −3
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ xfs_trans_ichgtime( 
	ASSERT(tp);

	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));



	/* If the mtime changes, then ctime must also change */

	ASSERT(flags & XFS_ICHGTIME_CHG);

	tv = current_time(inode);



	tv = inode_set_ctime_current(inode);

	if (flags & XFS_ICHGTIME_MOD)

		inode->i_mtime = tv;

	if (flags & XFS_ICHGTIME_CHG)

		inode_set_ctime_to_ts(inode, tv);

	if (flags & XFS_ICHGTIME_CREATE)

		ip->i_crtime = tv;

}

fs/xfs/xfs_iops.c

+3 −3
Original line number Diff line number Diff line
@@ -573,10 +573,10 @@ xfs_vn_getattr( 
	stat->gid = vfsgid_into_kgid(vfsgid);

	stat->ino = ip->i_ino;

	stat->atime = inode->i_atime;

	stat->mtime = inode->i_mtime;

	stat->ctime = inode_get_ctime(inode);

	stat->blocks = XFS_FSB_TO_BB(mp, ip->i_nblocks + ip->i_delayed_blks);



	fill_mg_cmtime(stat, request_mask, inode);



	if (xfs_has_v3inodes(mp)) {

		if (request_mask & STATX_BTIME) {

			stat->result_mask |= STATX_BTIME;
@@ -917,7 +917,7 @@ xfs_setattr_size( 
	if (newsize != oldsize &&

	    !(iattr->ia_valid & (ATTR_CTIME | ATTR_MTIME))) {

		iattr->ia_ctime = iattr->ia_mtime =

			current_mgtime(inode);

			current_time(inode);

		iattr->ia_valid |= ATTR_CTIME | ATTR_MTIME;

	}

fs/xfs/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -2065,7 +2065,7 @@ static struct file_system_type xfs_fs_type = { 
	.init_fs_context	= xfs_init_fs_context,

	.parameters		= xfs_fs_parameters,

	.kill_sb		= xfs_kill_sb,

	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME,

	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,

};

MODULE_ALIAS_FS("xfs");