| Message ID | 20230807-mgctime-v7-4-d1dec143a704@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bb7cc0a62e47b5810ed2721fc7eaaf709e42b966 |
| Headers | show |
| Series | fs: implement multigrain timestamps | expand |
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 <jlayton@kernel.org> Nice cleanup! Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> 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 >
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; }
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 <jlayton@kernel.org> --- fs/btrfs/inode.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)