[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: f8f9d952e42dd49ae534f61f2fa7ca0876cb9848
WARNING: Author mismatch between patch and upstream commit:
Backport author: Leah Rumancik<leah.rumancik@xxxxxxxxx>
Commit author: Long Li<leo.lilong@xxxxxxxxxx>
Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 005be6684225)
6.1.y | Present (different SHA1: 6beaebf68934)
Note: The patch differs from the upstream commit:
---
1: f8f9d952e42dd ! 1: 7e1e53b9da92c xfs: abort intent items when recovery intents fail
@@ Metadata
## Commit message ##
xfs: abort intent items when recovery intents fail
+ [ Upstream commit f8f9d952e42dd49ae534f61f2fa7ca0876cb9848 ]
+
When recovering intents, we capture newly created intent items as part of
committing recovered intent items. If intent recovery fails at a later
point, we forget to remove those newly created intent items from the AIL
@@ Commit message
Signed-off-by: Long Li <leo.lilong@xxxxxxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Signed-off-by: Chandan Babu R <chandanbabu@xxxxxxxxxx>
+ Signed-off-by: Leah Rumancik <leah.rumancik@xxxxxxxxx>
## fs/xfs/libxfs/xfs_defer.c ##
@@ fs/xfs/libxfs/xfs_defer.c: xfs_defer_ops_capture(
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
