xfs: attr forks require attr, not attr2

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")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
index 24a15bf784f11b06ab0f46dae93d84099b14e1c8..dba0cddcbab9c2db9e772137a47a290f9e2de7e7 100644 (file)
--- a/fs/xfs/scrub/bmap.c
+++ b/fs/xfs/scrub/bmap.c
@@ -938,7 +938,7 @@ xchk_bmap(
                }
                break;
        case XFS_ATTR_FORK:
-               if (!xfs_has_attr(mp) && !xfs_has_attr2(mp))
+               if (!xfs_has_attr(mp))
                        xchk_ino_set_corrupt(sc, sc->ip->i_ino);
                break;
        default: