xfs: remove XFS_DA_OP_REMOVE

Nobody checks this flag, so get rid of it.

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

diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index e4f55008552b4167e4c61ff530cfb7eed85f39ac..670ab2a613fc671c50a530351a76d59d72488cce 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -590,7 +590,6 @@ xfs_attr_init_add_state(struct xfs_da_args *args)
 static inline enum xfs_delattr_state
 xfs_attr_init_remove_state(struct xfs_da_args *args)
 {
-       args->op_flags |= XFS_DA_OP_REMOVE;
        if (xfs_attr_is_shortform(args->dp))
                return XFS_DAS_SF_REMOVE;
        if (xfs_attr_is_leaf(args->dp))

diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
index 7a004786ee0a2fdd5ecdba07231e0b0911aac02a..76e764080d994e2d795bc187ec23842ce78f2425 100644 (file)
--- a/fs/xfs/libxfs/xfs_da_btree.h
+++ b/fs/xfs/libxfs/xfs_da_btree.h
@@ -91,9 +91,8 @@ typedef struct xfs_da_args {
 #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_REMOVE       (1u << 6) /* this is a remove operation */
-#define XFS_DA_OP_RECOVERY     (1u << 7) /* Log recovery operation */
-#define XFS_DA_OP_LOGGED       (1u << 8) /* Use intent items to track op */
+#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_FLAGS \
        { XFS_DA_OP_JUSTCHECK,  "JUSTCHECK" }, \
@@ -102,7 +101,6 @@ typedef struct xfs_da_args {
        { XFS_DA_OP_OKNOENT,    "OKNOENT" }, \
        { XFS_DA_OP_CILOOKUP,   "CILOOKUP" }, \
        { XFS_DA_OP_NOTIME,     "NOTIME" }, \
-       { XFS_DA_OP_REMOVE,     "REMOVE" }, \
        { XFS_DA_OP_RECOVERY,   "RECOVERY" }, \
        { XFS_DA_OP_LOGGED,     "LOGGED" }