6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Darrick J. Wong commit 833f98b3be45bc7c6ce4c87bdc4892f546ab72ee upstream. LOLLM observes that we ought to make one last check for failed live updates before replacing the xattr structure. Let's be cautious here. Cc: stable@vger.kernel.org # v6.10 Fixes: e5d7ce0364d8ee ("xfs: replay unlocked parent pointer updates that accrue during xattr repair") Signed-off-by: Darrick J. Wong Assisted-by: LOLLM # finding obvious bugs Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino Signed-off-by: Greg Kroah-Hartman --- fs/xfs/scrub/attr_repair.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/xfs/scrub/attr_repair.c +++ b/fs/xfs/scrub/attr_repair.c @@ -1477,6 +1477,9 @@ xrep_xattr_rebuild_tree( if (error) return error; + if (rx->live_update_aborted) + return -EIO; + /* * Exchange the blocks mapped by the tempfile's attr fork with the file * being repaired. The old attr blocks will then be attached to the