[RESEND] xfs: reset XFS_ATTR_INCOMPLETE filter on node removal

[RESEND] xfs: reset XFS_ATTR_INCOMPLETE filter on node removal

[Andrey Albershteyn]

In XFS_DAS_NODE_REMOVE_ATTR case, xfs_attr_mode_remove_attr() sets
filter to XFS_ATTR_INCOMPLETE. The filter is then reset in
xfs_attr_complete_op() if XFS_DA_OP_REPLACE operation is performed.

The filter is not reset though if XFS just removes the attribute
(args->value == NULL) with xfs_attr_defer_remove(). attr code goes
to XFS_DAS_DONE state.

Fix this by always resetting XFS_ATTR_INCOMPLETE filter. The replace
operation already resets this filter in anyway and others are
completed at this step hence don't need it.

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
---
 fs/xfs/libxfs/xfs_attr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 9976a00a73f9..e965a48e7db9 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -421,10 +421,10 @@ xfs_attr_complete_op(
 	bool			do_replace = args->op_flags & XFS_DA_OP_REPLACE;
 
 	args->op_flags &= ~XFS_DA_OP_REPLACE;
-	if (do_replace) {
-		args->attr_filter &= ~XFS_ATTR_INCOMPLETE;
+	args->attr_filter &= ~XFS_ATTR_INCOMPLETE;
+	if (do_replace)
 		return replace_state;
-	}
+
 	return XFS_DAS_DONE;
 }
 
-- 
2.40.1

Re: [RESEND] xfs: reset XFS_ATTR_INCOMPLETE filter on node removal

[Christoph Hellwig]

On Wed, Jan 24, 2024 at 10:40:33AM +0100, Andrey Albershteyn wrote:
> In XFS_DAS_NODE_REMOVE_ATTR case, xfs_attr_mode_remove_attr() sets
> filter to XFS_ATTR_INCOMPLETE. The filter is then reset in
> xfs_attr_complete_op() if XFS_DA_OP_REPLACE operation is performed.
> 
> The filter is not reset though if XFS just removes the attribute
> (args->value == NULL) with xfs_attr_defer_remove(). attr code goes
> to XFS_DAS_DONE state.
> 
> Fix this by always resetting XFS_ATTR_INCOMPLETE filter. The replace
> operation already resets this filter in anyway and others are
> completed at this step hence don't need it.
> 
> Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>

Shuld this have a Fixes: tag?

Otherwise looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>