xfs: remove XFS_DA_OP_NOTIME

The only user of this flag sets it prior to an xfs_attr_get_ilocked
call, which doesn't update anything.  Get rid of the flag.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 05d22c5e388552e1d2bc56b4e457b4c4381cafab..30e6084122d8bcf5e6bf3df14a7e86f34ec6570f 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -365,7 +365,7 @@ xfs_attr_try_sf_addname(
         * Commit the shortform mods, and we're done.
         * NOTE: this is also the error path (EEXIST, etc).
         */
-       if (!error && !(args->op_flags & XFS_DA_OP_NOTIME))
+       if (!error)
                xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);
 
        if (xfs_has_wsync(dp->i_mount))
@@ -1033,8 +1033,7 @@ xfs_attr_set(
        if (xfs_has_wsync(mp))
                xfs_trans_set_sync(args->trans);
 
-       if (!(args->op_flags & XFS_DA_OP_NOTIME))
-               xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);
+       xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);
 
        /*
         * Commit the last in the sequence of transactions.

diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
index 76e764080d994e2d795bc187ec23842ce78f2425..b04a3290ffacce7d7525e0bd291be0c10d509748 100644 (file)
--- a/fs/xfs/libxfs/xfs_da_btree.h
+++ b/fs/xfs/libxfs/xfs_da_btree.h
@@ -90,9 +90,8 @@ typedef struct xfs_da_args {
 #define XFS_DA_OP_ADDNAME      (1u << 2) /* this is an add operation */
 #define XFS_DA_OP_OKNOENT      (1u << 3) /* lookup op, ENOENT ok, else die */
 #define XFS_DA_OP_CILOOKUP     (1u << 4) /* lookup returns CI name if found */
-#define XFS_DA_OP_NOTIME       (1u << 5) /* don't update inode timestamps */
-#define XFS_DA_OP_RECOVERY     (1u << 6) /* Log recovery operation */
-#define XFS_DA_OP_LOGGED       (1u << 7) /* Use intent items to track op */
+#define XFS_DA_OP_RECOVERY     (1u << 5) /* Log recovery operation */
+#define XFS_DA_OP_LOGGED       (1u << 6) /* Use intent items to track op */
 
 #define XFS_DA_OP_FLAGS \
        { XFS_DA_OP_JUSTCHECK,  "JUSTCHECK" }, \
@@ -100,7 +99,6 @@ typedef struct xfs_da_args {
        { XFS_DA_OP_ADDNAME,    "ADDNAME" }, \
        { XFS_DA_OP_OKNOENT,    "OKNOENT" }, \
        { XFS_DA_OP_CILOOKUP,   "CILOOKUP" }, \
-       { XFS_DA_OP_NOTIME,     "NOTIME" }, \
        { XFS_DA_OP_RECOVERY,   "RECOVERY" }, \
        { XFS_DA_OP_LOGGED,     "LOGGED" }
 

diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
index 8853e4d0eee3de0864af747565ae6f0939417684..5b855d7c98211793e04de00e4985d9bb97209efa 100644 (file)
--- a/fs/xfs/scrub/attr.c
+++ b/fs/xfs/scrub/attr.c
@@ -173,7 +173,6 @@ xchk_xattr_actor(
        void                    *priv)
 {
        struct xfs_da_args              args = {
-               .op_flags               = XFS_DA_OP_NOTIME,
                .attr_filter            = attr_flags & XFS_ATTR_NSP_ONDISK_MASK,
                .geo                    = sc->mp->m_attr_geo,
                .whichfork              = XFS_ATTR_FORK,