libxfs: create current_time helper and sync xfs_trans_ichgtime

Make xfs_trans_ichgtime() almost match kernelspace by creating a
new current_time() helper to match the kernel utility.

This reduces still more cosmetic change.  We may want to sync the
creation flag over to the kernel even though it's not used today.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 88b58ac38fd6783388231c7602b376cddc0b7d8e..9565adc1c0b97d13a269d60ba1d68c446e83312f 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -16,6 +16,16 @@ struct xfs_mount;
 struct xfs_inode_log_item;
 struct xfs_dir_ops;
 
+/*
+ * These are not actually used, they are only for userspace build
+ * compatibility in code that looks at i_state
+ */
+#define I_DIRTY_TIME           0
+#define I_DIRTY_TIME_EXPIRED   0
+
+#define IS_I_VERSION(inode)                    (0)
+#define inode_maybe_inc_iversion(inode,flags)  (0)
+
 /*
  * Inode interface. This fakes up a "VFS inode" to make the xfs_inode appear
  * similar to the kernel which now is used tohold certain parts of the on-disk
@@ -25,6 +35,7 @@ struct inode {
        mode_t          i_mode;
        uint32_t        i_nlink;
        xfs_dev_t       i_rdev;         /* This actually holds xfs_dev_t */
+       unsigned long   i_state;        /* Not actually used in userspace */
        uint32_t        i_generation;
        uint64_t        i_version;
        struct timespec i_atime;
@@ -149,6 +160,9 @@ extern void libxfs_trans_ichgtime(struct xfs_trans *,
                                struct xfs_inode *, int);
 extern int     libxfs_iflush_int (struct xfs_inode *, struct xfs_buf *);
 
+#define timespec64 timespec
+extern struct timespec64 current_time(struct inode *inode);
+
 /* Inode Cache Interfaces */
 extern bool    libxfs_inode_verify_forks(struct xfs_inode *ip);
 extern int     libxfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,

diff --git a/libxfs/util.c b/libxfs/util.c
index 0496dcb9af4413082486254ccf3165181ab27cd1..2ba9dc268e591c473c783a3ec8556a1f41630f53 100644 (file)
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -136,11 +136,21 @@ xfs_log_calc_unit_res(
        return unit_bytes;
 }
 
+struct timespec64
+current_time(struct inode *inode)
+{
+       struct timespec64       tv;
+       struct timeval          stv;
+
+       gettimeofday(&stv, (struct timezone *)0);
+       tv.tv_sec = stv.tv_sec;
+       tv.tv_nsec = stv.tv_usec * 1000;
+
+       return tv;
+}
+
 /*
  * Change the requested timestamp in the given inode.
- *
- * This was once shared with the kernel, but has diverged to the point
- * where it's no longer worth the hassle of maintaining common code.
  */
 void
 libxfs_trans_ichgtime(
@@ -148,12 +158,14 @@ libxfs_trans_ichgtime(
        struct xfs_inode        *ip,
        int                     flags)
 {
-       struct timespec tv;
-       struct timeval  stv;
+       struct inode            *inode = VFS_I(ip);
+       struct timespec64       tv;
+
+       ASSERT(tp);
+       ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
+
+       tv = current_time(inode);
 
-       gettimeofday(&stv, (struct timezone *)0);
-       tv.tv_sec = stv.tv_sec;
-       tv.tv_nsec = stv.tv_usec * 1000;
        if (flags & XFS_ICHGTIME_MOD)
                VFS_I(ip)->i_mtime = tv;
        if (flags & XFS_ICHGTIME_CHG)