[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 8ef1d96a985e4dc07ffbd71bd7fc5604a80cc644
WARNING: Author mismatch between patch and upstream commit: Backport author: Leah Rumancikleah.rumancik@gmail.com Commit author: Darrick J. Wongdjwong@kernel.org
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: c13c21f77824)
Note: The patch differs from the upstream commit: --- 1: 8ef1d96a985e4 ! 1: e96849ae4ddac xfs: require XFS_SB_FEAT_INCOMPAT_LOG_XATTRS for attr log intent item recovery @@ Metadata ## Commit message ## xfs: require XFS_SB_FEAT_INCOMPAT_LOG_XATTRS for attr log intent item recovery
+ [ Upstream commit 8ef1d96a985e4dc07ffbd71bd7fc5604a80cc644 ] + The XFS_SB_FEAT_INCOMPAT_LOG_XATTRS feature bit protects a filesystem from old kernels that do not know how to recover extended attribute log intent items. Make this check mandatory instead of a debugging assert. @@ Commit message Fixes: fd920008784ea ("xfs: Set up infrastructure for log attribute replay") Signed-off-by: Darrick J. Wong djwong@kernel.org Reviewed-by: Christoph Hellwig hch@lst.de + Signed-off-by: Leah Rumancik leah.rumancik@gmail.com + Acked-by: "Darrick J. Wong" djwong@kernel.org
## fs/xfs/xfs_attr_item.c ## @@ fs/xfs/xfs_attr_item.c: xfs_attri_validate( @@ fs/xfs/xfs_attr_item.c: xfs_attri_validate( if (attrp->__pad != 0) return false;
-@@ fs/xfs/xfs_attr_item.c: xfs_attri_recover_work( +@@ fs/xfs/xfs_attr_item.c: xfs_attri_item_recover( + args->op_flags = XFS_DA_OP_RECOVERY | XFS_DA_OP_OKNOENT | XFS_DA_OP_LOGGED; - args->owner = args->dp->i_ino;
- ASSERT(xfs_sb_version_haslogxattrs(&mp->m_sb)); - ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |