On Wed 04-09-24 14:29:17, Zhang Yi wrote:
> From: Zhang Yi <yi.zhang@xxxxxxxxxx>
>
> After commit 'ad5cd4f4ee4d ("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: Zhang Yi <yi.zhang@xxxxxxxxxx>
Good point! Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/ext4/extents.c | 4 ----
> fs/ext4/inode.c | 1 -
> 2 files changed, 5 deletions(-)
>
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index 7d5edfa2e630..19a9b14935b7 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -4643,7 +4643,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,
>
> /* Now release the pages and zero block aligned part of pages */
> truncate_pagecache_range(inode, start, end - 1);
> - inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
>
> ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,
> flags);
> @@ -4667,7 +4666,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,
> goto out_invalidate_lock;
> }
>
> - 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);
> @@ -5393,7 +5391,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);
>
> @@ -5503,7 +5500,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;
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index c3d7606a5315..8af25442d44d 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -4074,7 +4074,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;
> --
> 2.39.2
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
