[PATCH v2 10/92] ubifs: convert to simple_rename_timestamp

[Jan Kara]

On Wed 05-07-23 15:00:35, Jeff Layton wrote:
> A rename potentially involves updating 4 different inode timestamps.
> Convert to the new simple_rename_timestamp helper function.
> 
> Signed-off-by: Jeff Layton <jlayton at kernel.org>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack at suse.cz>

								Honza

> ---
>  fs/ubifs/dir.c | 15 +++------------
>  1 file changed, 3 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
> index ef0499edc248..7ec25310bd8a 100644
> --- a/fs/ubifs/dir.c
> +++ b/fs/ubifs/dir.c
> @@ -1414,8 +1414,7 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
>  	 * Like most other Unix systems, set the @i_ctime for inodes on a
>  	 * rename.
>  	 */
> -	time = current_time(old_dir);
> -	old_inode->i_ctime = time;
> +	simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);
>  
>  	/* We must adjust parent link count when renaming directories */
>  	if (is_dir) {
> @@ -1444,13 +1443,11 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
>  
>  	old_dir->i_size -= old_sz;
>  	ubifs_inode(old_dir)->ui_size = old_dir->i_size;
> -	old_dir->i_mtime = old_dir->i_ctime = time;
> -	new_dir->i_mtime = new_dir->i_ctime = time;
>  
>  	/*
>  	 * And finally, if we unlinked a direntry which happened to have the
>  	 * same name as the moved direntry, we have to decrement @i_nlink of
> -	 * the unlinked inode and change its ctime.
> +	 * the unlinked inode.
>  	 */
>  	if (unlink) {
>  		/*
> @@ -1462,7 +1459,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
>  			clear_nlink(new_inode);
>  		else
>  			drop_nlink(new_inode);
> -		new_inode->i_ctime = time;
>  	} else {
>  		new_dir->i_size += new_sz;
>  		ubifs_inode(new_dir)->ui_size = new_dir->i_size;
> @@ -1557,7 +1553,6 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry,
>  	int sync = IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir);
>  	struct inode *fst_inode = d_inode(old_dentry);
>  	struct inode *snd_inode = d_inode(new_dentry);
> -	struct timespec64 time;
>  	int err;
>  	struct fscrypt_name fst_nm, snd_nm;
>  
> @@ -1588,11 +1583,7 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry,
>  
>  	lock_4_inodes(old_dir, new_dir, NULL, NULL);
>  
> -	time = current_time(old_dir);
> -	fst_inode->i_ctime = time;
> -	snd_inode->i_ctime = time;
> -	old_dir->i_mtime = old_dir->i_ctime = time;
> -	new_dir->i_mtime = new_dir->i_ctime = time;
> +	simple_rename_timestamp(old_dir, old_dentry, new_dir, new_dentry);
>  
>  	if (old_dir != new_dir) {
>  		if (S_ISDIR(fst_inode->i_mode) && !S_ISDIR(snd_inode->i_mode)) {
> -- 
> 2.41.0
> 
-- 
Jan Kara <jack at suse.com>
SUSE Labs, CR