2023-08-07 19:45:18

by Jeff Layton

Subject: [PATCH v7 04/13] btrfs: have it use inode_update_timestamps

In later patches, we're going to drop the "now" argument from the
update_time operation. Have btrfs_update_time use the new
inode_update_timestamps helper to fetch a new timestamp and update it
properly.

Signed-off-by: Jeff Layton <[email protected]>
---
fs/btrfs/inode.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 29a20f828dda..d52e7d64570a 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6068,14 +6068,7 @@ static int btrfs_update_time(struct inode *inode, struct timespec64 *now,
if (btrfs_root_readonly(root))
return -EROFS;

- if (flags & S_VERSION)
- dirty |= inode_maybe_inc_iversion(inode, dirty);
- if (flags & S_CTIME)
- inode_set_ctime_to_ts(inode, *now);
- if (flags & S_MTIME)
- inode->i_mtime = *now;
- if (flags & S_ATIME)
- inode->i_atime = *now;
+ dirty = inode_update_timestamps(inode, flags);
return dirty ? btrfs_dirty_inode(BTRFS_I(inode)) : 0;
}


--
2.41.0

2023-08-08 22:00:34

by Jan Kara

Subject: Re: [PATCH v7 04/13] btrfs: have it use inode_update_timestamps

On Mon 07-08-23 15:38:35, Jeff Layton wrote:
> In later patches, we're going to drop the "now" argument from the
> update_time operation. Have btrfs_update_time use the new
> inode_update_timestamps helper to fetch a new timestamp and update it
> properly.
>
> Signed-off-by: Jeff Layton <[email protected]>

Nice cleanup! Feel free to add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/btrfs/inode.c | 9 +--------
> 1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 29a20f828dda..d52e7d64570a 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -6068,14 +6068,7 @@ static int btrfs_update_time(struct inode *inode, struct timespec64 *now,
> if (btrfs_root_readonly(root))
> return -EROFS;
>
> - if (flags & S_VERSION)
> - dirty |= inode_maybe_inc_iversion(inode, dirty);
> - if (flags & S_CTIME)
> - inode_set_ctime_to_ts(inode, *now);
> - if (flags & S_MTIME)
> - inode->i_mtime = *now;
> - if (flags & S_ATIME)
> - inode->i_atime = *now;
> + dirty = inode_update_timestamps(inode, flags);
> return dirty ? btrfs_dirty_inode(BTRFS_I(inode)) : 0;
> }
>
>
> --
> 2.41.0
>
--
Jan Kara <[email protected]>
SUSE Labs, CR