Commit 8ef1d96a authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: require XFS_SB_FEAT_INCOMPAT_LOG_XATTRS for attr log intent item recovery



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.

Fixes: fd920008 ("xfs: Set up infrastructure for log attribute replay")
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent ef80de94
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ xfs_attri_validate(
	unsigned int			op = attrp->alfi_op_flags &
					     XFS_ATTRI_OP_FLAGS_TYPE_MASK;

	if (!xfs_sb_version_haslogxattrs(&mp->m_sb))
		return false;

	if (attrp->__pad != 0)
		return false;

@@ -570,8 +573,6 @@ xfs_attri_recover_work(
			 XFS_DA_OP_LOGGED;
	args->owner = args->dp->i_ino;

	ASSERT(xfs_sb_version_haslogxattrs(&mp->m_sb));

	switch (attr->xattri_op_flags) {
	case XFS_ATTRI_OP_FLAGS_SET:
	case XFS_ATTRI_OP_FLAGS_REPLACE: