Commit 73ae756e authored by Zhang Yi's avatar Zhang Yi Committed by Theodore Ts'o
Browse files

ext4: don't explicit update times in ext4_fallocate() 



After commit 'ad5cd4f4 ("ext4: fix fallocate to use file_modified to
update permissions consistently"), we can update mtime and ctime
appropriately through file_modified() when doing zero range, collapse
rage, insert range and punch hole, hence there is no need to explicit
update times in those paths, just drop them.

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarOjaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://patch.msgid.link/20241220011637.1157197-3-yi.zhang@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 17207d0b

fs/ext4/extents.c

+0 −5
Original line number Diff line number Diff line
@@ -4674,8 +4674,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
			goto out_mutex;

		}



		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));



		ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,

					     flags);

		filemap_invalidate_unlock(mapping);
@@ -4699,7 +4697,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		goto out_mutex;

	}



	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	if (new_size)

		ext4_update_inode_size(inode, new_size);

	ret = ext4_mark_inode_dirty(handle, inode);
@@ -5435,7 +5432,6 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len) 
	up_write(&EXT4_I(inode)->i_data_sem);

	if (IS_SYNC(inode))

		ext4_handle_sync(handle);

	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	ret = ext4_mark_inode_dirty(handle, inode);

	ext4_update_inode_fsync_trans(handle, inode, 1);
@@ -5545,7 +5541,6 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len) 
	/* Expand file to avoid data loss if there is error while shifting */

	inode->i_size += len;

	EXT4_I(inode)->i_disksize += len;

	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	ret = ext4_mark_inode_dirty(handle, inode);

	if (ret)

		goto out_stop;

fs/ext4/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -4139,7 +4139,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) 
	if (IS_SYNC(inode))

		ext4_handle_sync(handle);



	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));

	ret2 = ext4_mark_inode_dirty(handle, inode);

	if (unlikely(ret2))

		ret = ret2;