xfs: XFS_DAS_LEAF_REPLACE state only needed if !LARP
We can skip the REPLACE state when LARP is enabled, but that means the XFS_DAS_FLIP_LFLAG state is now poorly named - it indicates something that has been done rather than what the state is going to do. Rename it to "REMOVE_OLD" to indicate that we are now going to perform removal of the old attr. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Allison Henderson<allison.henderson@oracle.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
committed by
Dave Chinner
parent
7d03533629
commit
411b434a63
@ -455,7 +455,7 @@ enum xfs_delattr_state {
|
||||
XFS_DAS_LEAF_SET_RMT, /* set a remote xattr from a leaf */
|
||||
XFS_DAS_LEAF_ALLOC_RMT, /* We are allocating remote blocks */
|
||||
XFS_DAS_LEAF_REPLACE, /* Perform replace ops on a leaf */
|
||||
XFS_DAS_FLIP_LFLAG, /* Flipped leaf INCOMPLETE attr flag */
|
||||
XFS_DAS_LEAF_REMOVE_OLD, /* Start removing old attr from leaf */
|
||||
XFS_DAS_RM_LBLK, /* A rename is removing leaf blocks */
|
||||
XFS_DAS_RD_LEAF, /* Read in the new leaf */
|
||||
|
||||
@ -463,7 +463,7 @@ enum xfs_delattr_state {
|
||||
XFS_DAS_NODE_SET_RMT, /* set a remote xattr from a node */
|
||||
XFS_DAS_NODE_ALLOC_RMT, /* We are allocating remote blocks */
|
||||
XFS_DAS_NODE_REPLACE, /* Perform replace ops on a node */
|
||||
XFS_DAS_FLIP_NFLAG, /* Flipped node INCOMPLETE attr flag */
|
||||
XFS_DAS_NODE_REMOVE_OLD, /* Start removing old attr from node */
|
||||
XFS_DAS_RM_NBLK, /* A rename is removing node blocks */
|
||||
XFS_DAS_CLR_FLAG, /* Clear incomplete flag */
|
||||
|
||||
@ -471,26 +471,26 @@ enum xfs_delattr_state {
|
||||
};
|
||||
|
||||
#define XFS_DAS_STRINGS \
|
||||
{ XFS_DAS_UNINIT, "XFS_DAS_UNINIT" }, \
|
||||
{ XFS_DAS_SF_ADD, "XFS_DAS_SF_ADD" }, \
|
||||
{ XFS_DAS_LEAF_ADD, "XFS_DAS_LEAF_ADD" }, \
|
||||
{ XFS_DAS_NODE_ADD, "XFS_DAS_NODE_ADD" }, \
|
||||
{ XFS_DAS_RMTBLK, "XFS_DAS_RMTBLK" }, \
|
||||
{ XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \
|
||||
{ XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \
|
||||
{ XFS_DAS_LEAF_SET_RMT, "XFS_DAS_LEAF_SET_RMT" }, \
|
||||
{ XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \
|
||||
{ XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \
|
||||
{ XFS_DAS_FLIP_LFLAG, "XFS_DAS_FLIP_LFLAG" }, \
|
||||
{ XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \
|
||||
{ XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \
|
||||
{ XFS_DAS_NODE_SET_RMT, "XFS_DAS_NODE_SET_RMT" }, \
|
||||
{ XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \
|
||||
{ XFS_DAS_NODE_REPLACE, "XFS_DAS_NODE_REPLACE" }, \
|
||||
{ XFS_DAS_FLIP_NFLAG, "XFS_DAS_FLIP_NFLAG" }, \
|
||||
{ XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \
|
||||
{ XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \
|
||||
{ XFS_DAS_DONE, "XFS_DAS_DONE" }
|
||||
{ XFS_DAS_UNINIT, "XFS_DAS_UNINIT" }, \
|
||||
{ XFS_DAS_SF_ADD, "XFS_DAS_SF_ADD" }, \
|
||||
{ XFS_DAS_LEAF_ADD, "XFS_DAS_LEAF_ADD" }, \
|
||||
{ XFS_DAS_NODE_ADD, "XFS_DAS_NODE_ADD" }, \
|
||||
{ XFS_DAS_RMTBLK, "XFS_DAS_RMTBLK" }, \
|
||||
{ XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \
|
||||
{ XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \
|
||||
{ XFS_DAS_LEAF_SET_RMT, "XFS_DAS_LEAF_SET_RMT" }, \
|
||||
{ XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \
|
||||
{ XFS_DAS_LEAF_REPLACE, "XFS_DAS_LEAF_REPLACE" }, \
|
||||
{ XFS_DAS_LEAF_REMOVE_OLD, "XFS_DAS_LEAF_REMOVE_OLD" }, \
|
||||
{ XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \
|
||||
{ XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \
|
||||
{ XFS_DAS_NODE_SET_RMT, "XFS_DAS_NODE_SET_RMT" }, \
|
||||
{ XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \
|
||||
{ XFS_DAS_NODE_REPLACE, "XFS_DAS_NODE_REPLACE" }, \
|
||||
{ XFS_DAS_NODE_REMOVE_OLD, "XFS_DAS_NODE_REMOVE_OLD" }, \
|
||||
{ XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \
|
||||
{ XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \
|
||||
{ XFS_DAS_DONE, "XFS_DAS_DONE" }
|
||||
|
||||
/*
|
||||
* Defines for xfs_attr_item.xattri_flags
|
||||
|
Reference in New Issue
Block a user