@@ -35,6 +35,10 @@ _require_metadata_journaling $SCRATCH_DEV
_init_flakey
_mount_flakey
+# The fiemap results in the golden output requires file allocations to align to
+# 256K boundaries.
+_require_congruent_file_oplen $SCRATCH_MNT 262144
+
# Create our test files.
$XFS_IO_PROG -f -c "pwrite -S 0xea 0 256K" $SCRATCH_MNT/foo >/dev/null
@@ -38,6 +38,10 @@ _require_metadata_journaling $SCRATCH_DEV
_init_flakey
_mount_flakey
+# The fiemap results in the golden output requires file allocations to align to
+# 1MB boundaries.
+_require_congruent_file_oplen $SCRATCH_MNT 1048576
+
# Create our test file with many extents.
# On btrfs this results in having multiple leaves of metadata full of file
# extent items, a condition necessary to trigger the original bug.
@@ -71,6 +71,10 @@ TEST_PROG=$here/src/unwritten_mmap
# we need to set the file size to (6 * 2MB == 12MB) to cover all cases.
FILE_SIZE=$((12 * 1048576))
+# The xfs_bmap results in the golden output requires file allocations to align
+# to 1M boundaries.
+_require_congruent_file_oplen $SCRATCH_MNT $FILE_SIZE
+
rm -f $TEST_FILE
$TEST_PROG $FILE_SIZE $TEST_FILE
@@ -51,6 +51,10 @@ _require_scratch
_scratch_mkfs > /dev/null 2>&1
_scratch_mount > /dev/null 2>&1
+# The xfs_bmap results in the golden output requires file allocations to align
+# to 64k boundaries.
+_require_congruent_file_oplen $SCRATCH_MNT 65536
+
for i in 10 14 15 16 17 28 29 30 31; do
rm -f $SCRATCH_MNT/hole_file
_write_holes $SCRATCH_MNT/hole_file${i} ${i}