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

btrfs: convert to new timestamp accessors 



Convert to using the new inode timestamp accessor functions.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185347.80880-21-jlayton@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent ce17a80c

fs/btrfs/delayed-inode.c

+10 −10
Original line number Diff line number Diff line
@@ -1834,19 +1834,19 @@ static void fill_stack_inode_item(struct btrfs_trans_handle *trans, 
	btrfs_set_stack_inode_block_group(inode_item, 0);



	btrfs_set_stack_timespec_sec(&inode_item->atime,

				     inode->i_atime.tv_sec);

				     inode_get_atime_sec(inode));

	btrfs_set_stack_timespec_nsec(&inode_item->atime,

				      inode->i_atime.tv_nsec);

				      inode_get_atime_nsec(inode));



	btrfs_set_stack_timespec_sec(&inode_item->mtime,

				     inode->i_mtime.tv_sec);

				     inode_get_mtime_sec(inode));

	btrfs_set_stack_timespec_nsec(&inode_item->mtime,

				      inode->i_mtime.tv_nsec);

				      inode_get_mtime_nsec(inode));



	btrfs_set_stack_timespec_sec(&inode_item->ctime,

				     inode_get_ctime(inode).tv_sec);

				     inode_get_ctime_sec(inode));

	btrfs_set_stack_timespec_nsec(&inode_item->ctime,

				      inode_get_ctime(inode).tv_nsec);

				      inode_get_ctime_nsec(inode));



	btrfs_set_stack_timespec_sec(&inode_item->otime,

				     BTRFS_I(inode)->i_otime.tv_sec);
@@ -1891,11 +1891,11 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev) 
	btrfs_inode_split_flags(btrfs_stack_inode_flags(inode_item),

				&BTRFS_I(inode)->flags, &BTRFS_I(inode)->ro_flags);



	inode->i_atime.tv_sec = btrfs_stack_timespec_sec(&inode_item->atime);

	inode->i_atime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->atime);

	inode_set_atime(inode, btrfs_stack_timespec_sec(&inode_item->atime),

			btrfs_stack_timespec_nsec(&inode_item->atime));



	inode->i_mtime.tv_sec = btrfs_stack_timespec_sec(&inode_item->mtime);

	inode->i_mtime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->mtime);

	inode_set_mtime(inode, btrfs_stack_timespec_sec(&inode_item->mtime),

			btrfs_stack_timespec_nsec(&inode_item->mtime));



	inode_set_ctime(inode, btrfs_stack_timespec_sec(&inode_item->ctime),

			btrfs_stack_timespec_nsec(&inode_item->ctime));

fs/btrfs/file.c

+10 −8
Original line number Diff line number Diff line
@@ -1108,17 +1108,18 @@ void btrfs_check_nocow_unlock(struct btrfs_inode *inode) 


static void update_time_for_write(struct inode *inode)

{

	struct timespec64 now, ctime;

	struct timespec64 now, ts;



	if (IS_NOCMTIME(inode))

		return;



	now = current_time(inode);

	if (!timespec64_equal(&inode->i_mtime, &now))

		inode->i_mtime = now;

	ts = inode_get_mtime(inode);

	if (!timespec64_equal(&ts, &now))

		inode_set_mtime_to_ts(inode, now);



	ctime = inode_get_ctime(inode);

	if (!timespec64_equal(&ctime, &now))

	ts = inode_get_ctime(inode);

	if (!timespec64_equal(&ts, &now))

		inode_set_ctime_to_ts(inode, now);



	if (IS_I_VERSION(inode))
@@ -2473,7 +2474,8 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode, 
		inode_inc_iversion(&inode->vfs_inode);



		if (!extent_info || extent_info->update_times)

			inode->vfs_inode.i_mtime = inode_set_ctime_current(&inode->vfs_inode);

			inode_set_mtime_to_ts(&inode->vfs_inode,

					      inode_set_ctime_current(&inode->vfs_inode));



		ret = btrfs_update_inode(trans, root, inode);

		if (ret)
@@ -2714,7 +2716,7 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len) 


	ASSERT(trans != NULL);

	inode_inc_iversion(inode);

	inode->i_mtime = inode_set_ctime_current(inode);

	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

	updated_inode = true;

	btrfs_end_transaction(trans);
@@ -2734,7 +2736,7 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len) 
		struct timespec64 now = inode_set_ctime_current(inode);



		inode_inc_iversion(inode);

		inode->i_mtime = now;

		inode_set_mtime_to_ts(inode, now);

		trans = btrfs_start_transaction(root, 1);

		if (IS_ERR(trans)) {

			ret = PTR_ERR(trans);

fs/btrfs/inode.c

+21 −22
Original line number Diff line number Diff line
@@ -3754,11 +3754,11 @@ static int btrfs_read_locked_inode(struct inode *inode, 
	btrfs_inode_set_file_extent_range(BTRFS_I(inode), 0,

			round_up(i_size_read(inode), fs_info->sectorsize));



	inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);

	inode->i_atime.tv_nsec = btrfs_timespec_nsec(leaf, &inode_item->atime);

	inode_set_atime(inode, btrfs_timespec_sec(leaf, &inode_item->atime),

			btrfs_timespec_nsec(leaf, &inode_item->atime));



	inode->i_mtime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->mtime);

	inode->i_mtime.tv_nsec = btrfs_timespec_nsec(leaf, &inode_item->mtime);

	inode_set_mtime(inode, btrfs_timespec_sec(leaf, &inode_item->mtime),

			btrfs_timespec_nsec(leaf, &inode_item->mtime));



	inode_set_ctime(inode, btrfs_timespec_sec(leaf, &inode_item->ctime),

			btrfs_timespec_nsec(leaf, &inode_item->ctime));
@@ -3922,19 +3922,19 @@ static void fill_inode_item(struct btrfs_trans_handle *trans, 
	btrfs_set_token_inode_nlink(&token, item, inode->i_nlink);



	btrfs_set_token_timespec_sec(&token, &item->atime,

				     inode->i_atime.tv_sec);

				     inode_get_atime_sec(inode));

	btrfs_set_token_timespec_nsec(&token, &item->atime,

				      inode->i_atime.tv_nsec);

				      inode_get_atime_nsec(inode));



	btrfs_set_token_timespec_sec(&token, &item->mtime,

				     inode->i_mtime.tv_sec);

				     inode_get_mtime_sec(inode));

	btrfs_set_token_timespec_nsec(&token, &item->mtime,

				      inode->i_mtime.tv_nsec);

				      inode_get_mtime_nsec(inode));



	btrfs_set_token_timespec_sec(&token, &item->ctime,

				     inode_get_ctime(inode).tv_sec);

				     inode_get_ctime_sec(inode));

	btrfs_set_token_timespec_nsec(&token, &item->ctime,

				      inode_get_ctime(inode).tv_nsec);

				      inode_get_ctime_nsec(inode));



	btrfs_set_token_timespec_sec(&token, &item->otime,

				     BTRFS_I(inode)->i_otime.tv_sec);
@@ -4132,8 +4132,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
	btrfs_i_size_write(dir, dir->vfs_inode.i_size - name->len * 2);

	inode_inc_iversion(&inode->vfs_inode);

	inode_inc_iversion(&dir->vfs_inode);

	inode_set_ctime_current(&inode->vfs_inode);

	dir->vfs_inode.i_mtime = inode_set_ctime_current(&dir->vfs_inode);

 	inode_set_mtime_to_ts(&dir->vfs_inode, inode_set_ctime_current(&dir->vfs_inode));

	ret = btrfs_update_inode(trans, root, dir);

out:

	return ret;
@@ -4306,7 +4305,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 


	btrfs_i_size_write(dir, dir->vfs_inode.i_size - fname.disk_name.len * 2);

	inode_inc_iversion(&dir->vfs_inode);

	dir->vfs_inode.i_mtime = inode_set_ctime_current(&dir->vfs_inode);

	inode_set_mtime_to_ts(&dir->vfs_inode, inode_set_ctime_current(&dir->vfs_inode));

	ret = btrfs_update_inode_fallback(trans, root, dir);

	if (ret)

		btrfs_abort_transaction(trans, ret);
@@ -4956,7 +4955,8 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr) 
	if (newsize != oldsize) {

		inode_inc_iversion(inode);

		if (!(mask & (ATTR_CTIME | ATTR_MTIME))) {

			inode->i_mtime = inode_set_ctime_current(inode);

			inode_set_mtime_to_ts(inode,

					      inode_set_ctime_current(inode));

		}

	}
@@ -5600,9 +5600,9 @@ static struct inode *new_simple_dir(struct inode *dir, 
	inode->i_opflags &= ~IOP_XATTR;

	inode->i_fop = &simple_dir_operations;

	inode->i_mode = S_IFDIR | S_IRUGO | S_IWUSR | S_IXUGO;

	inode->i_mtime = inode_set_ctime_current(inode);

	inode->i_atime = dir->i_atime;

	BTRFS_I(inode)->i_otime = inode->i_mtime;

	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	inode_set_atime_to_ts(inode, inode_get_atime(dir));

	BTRFS_I(inode)->i_otime = inode_get_mtime(inode);

	inode->i_uid = dir->i_uid;

	inode->i_gid = dir->i_gid;
@@ -6277,9 +6277,8 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans, 
		goto discard;

	}



	inode->i_mtime = inode_set_ctime_current(inode);

	inode->i_atime = inode->i_mtime;

	BTRFS_I(inode)->i_otime = inode->i_mtime;

	simple_inode_init_ts(inode);

	BTRFS_I(inode)->i_otime = inode_get_mtime(inode);



	/*

	 * We're going to fill the inode item now, so at this point the inode
@@ -6444,8 +6443,8 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, 
	 * values (the ones it had when the fsync was done).

	 */

	if (!test_bit(BTRFS_FS_LOG_RECOVERING, &root->fs_info->flags))

		parent_inode->vfs_inode.i_mtime =

			inode_set_ctime_current(&parent_inode->vfs_inode);

		inode_set_mtime_to_ts(&parent_inode->vfs_inode,

				      inode_set_ctime_current(&parent_inode->vfs_inode));



	ret = btrfs_update_inode(trans, root, parent_inode);

	if (ret)

fs/btrfs/reflink.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans, 


	inode_inc_iversion(inode);

	if (!no_time_update) {

		inode->i_mtime = inode_set_ctime_current(inode);

		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	}

	/*

	 * We round up to the block size at eof when determining which

fs/btrfs/transaction.c

+2 −1
Original line number Diff line number Diff line
@@ -1860,7 +1860,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 


	btrfs_i_size_write(BTRFS_I(parent_inode), parent_inode->i_size +

						  fname.disk_name.len * 2);

	parent_inode->i_mtime = inode_set_ctime_current(parent_inode);

	inode_set_mtime_to_ts(parent_inode,

			      inode_set_ctime_current(parent_inode));

	ret = btrfs_update_inode_fallback(trans, parent_root, BTRFS_I(parent_inode));

	if (ret) {

		btrfs_abort_transaction(trans, ret);