[Cluster-devel] [PATCH v7 07/13] xfs: have xfs_vn_update_time gets its own timestamp

[Jeff Layton]

In later patches we're going to drop the "now" parameter from the
update_time operation. Prepare XFS for this by reworking how it fetches
timestamps and sets them in the inode. Ensure that we update the ctime
even if only S_MTIME is set.

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 fs/xfs/xfs_iops.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 731f45391baa..72d18e7840f5 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1037,6 +1037,7 @@ xfs_vn_update_time(
        int                     log_flags = XFS_ILOG_TIMESTAMP;
        struct xfs_trans        *tp;
        int                     error;
+       struct timespec64       now = current_time(inode);
 
        trace_xfs_update_time(ip);
 
@@ -1056,12 +1057,15 @@ xfs_vn_update_time(
                return error;
 
        xfs_ilock(ip, XFS_ILOCK_EXCL);
-       if (flags & S_CTIME)
-               inode_set_ctime_to_ts(inode, *now);
+       if (flags & (S_CTIME|S_MTIME))
+               now = inode_set_ctime_current(inode);
+       else
+               now = current_time(inode);
+
        if (flags & S_MTIME)
-               inode->i_mtime = *now;
+               inode->i_mtime = now;
        if (flags & S_ATIME)
-               inode->i_atime = *now;
+               inode->i_atime = now;
 
        xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
        xfs_trans_log_inode(tp, ip, log_flags);

-- 
2.41.0