Patch "xfs: fix recovery of partial attr removals" has been added to the 7.3-stable tree
Sasha Levin
AppliedThis is a note to let you know that I've just added the patch titled
xfs: fix recovery of partial attr removals
to the 7.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xfs-fix-recovery-of-partial-attr-removals.patch
and it can be found in the queue-7.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
commit ee067ecb28110088a13ee363a13eb78f69dd8db0
Author: Christoph Hellwig <[email protected]> Date: Wed Oct 28 09:09:39 2026 +0100
xfs: fix recovery of partial attr removals
[ Upstream commit 30bb61651d2da5a502cf504bcdad16c093c1bb08 ]
When running xfs/753 on parent pointer-enabled file systems with DEBUG enabled, log recovery will eventually crash after a few dozen iterations due to an ASSERT that XFS_ATTR_INCOMPLETE is not already set when xfs_attr3_leaf_setflag is called:
XFS: Assertion failed: (entry->flags & XFS_ATTR_INCOMPLETE) == 0, file: fs/xfs/libxfs/xfs_attr_leaf.c, line: 3045
This is because parent pointer use logged attributes, and the attribute intents do not track the work that has been done as the transaction rolls, and the recovery mechanism is to run the operation from scratch. Because of this various places check for XFS_DA_OP_RECOVERY skip work already done. But while recovery tolerates an attribute already fully removed, it currently trips the above assert for an attribute that already has the INCOMPLETE bit set, but still exists. Fix this by handling the case like all the others.
fs/xfs/libxfs/xfs_attr_leaf.c +8 -1
@@ -3042,7 +3042,14 @@ xfs_attr3_leaf_setflag(#endif entry = &xfs_attr3_leaf_entryp (leaf)[args->index]; -ASSERT ((entry->flags &XFS_ATTR_INCOMPLETE ) ==0 ); +if (entry->flags &XFS_ATTR_INCOMPLETE ) { +if (!(args->op_flags &XFS_DA_OP_RECOVERY )) { +ASSERT (args->op_flags &XFS_DA_OP_RECOVERY ); +return -EFSCORRUPTED ; + } +return 0 ; + } + entry->flags |=XFS_ATTR_INCOMPLETE ;xfs_trans_log_buf (args->trans, bp,XFS_DA_LOGRANGE (leaf, entry,sizeof (*entry)));