Skip to contentSkip to conversation

xfs: attr forks require attr, not attr2

PATCH In review Darrick J. Wong 2 participants 2 messages Aug 5, 2024 – Aug 6, 2024 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: attr forks require attr, not attr2

From: Darrick J. Wong <[email protected]>

It turns out that I misunderstood the difference between the attr and attr2 feature bits. "attr" means that at some point an attr fork was created somewhere in the filesystem. "attr2" means that inodes have variable-sized forks, but says nothing about whether or not there actually /are/ attr forks in the system.

If we have an attr fork, we only need to check that attr is set.

Fixes 99d9d8d05da26 ("xfs: scrub inode block mappings")
---
 fs/xfs/scrub/bmap.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
fs/xfs/scrub/bmap.c +7 -1
index 24a15bf784f1..5ab2ac53c920 100644
@@ -938,7 +938,13 @@ xchk_bmap(
 		}
 		break;
 	case XFS_ATTR_FORK:
-		if (!xfs_has_attr(mp) && !xfs_has_attr2(mp))
+		/*
+		 * "attr" means that an attr fork was created at some point in
+		 * the life of this filesystem.  "attr2" means that inodes have
+		 * variable-sized data/attr fork areas.  Hence we only check
+		 * attr here.
+		 */
+		if (!xfs_has_attr(mp))
 			xchk_ino_set_corrupt(sc, sc->ip->i_ino);
 		break;
 	default: