From: Filipe Manana Date: Tue, 31 Mar 2026 14:15:10 +0000 (+0100) Subject: fstests: add kernel commit IDs for patches already merged upstream X-Git-Tag: v2026.04.20~13 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c34c06b9728c2b3e3dbe7666de29f0fb57f24f33;p=xfstests-dev.git fstests: add kernel commit IDs for patches already merged upstream Several tests mention patches that are already in Linus' git tree, so add their commit IDs. For generic/762, also use "fixed_by_fs_commit xfs" instead of "_fixed_by_git_commit kernel" since it's a XFS specific commit and it does not make sense for the test to report that commit in case it fails when running against a filesystem other than XFS. Signed-off-by: Filipe Manana Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- diff --git a/tests/btrfs/340 b/tests/btrfs/340 index fc3b8d62..872f790c 100755 --- a/tests/btrfs/340 +++ b/tests/btrfs/340 @@ -10,7 +10,7 @@ . ./common/preamble _begin_fstest auto quick qgroup -_fixed_by_kernel_commit xxxxxxxxxxxx \ +_fixed_by_kernel_commit 68d4b3fa18d7 \ "btrfs: qgroup: update all parent qgroups when doing quick inherit" # For the automatic fsck at unmount. diff --git a/tests/btrfs/345 b/tests/btrfs/345 index 75cc3067..58727049 100755 --- a/tests/btrfs/345 +++ b/tests/btrfs/345 @@ -17,7 +17,7 @@ _require_scratch _require_btrfs_support_sectorsize 4096 _require_btrfs_command "property" -_fixed_by_kernel_commit xxxxxxxxxxxx \ +_fixed_by_kernel_commit e1b18b959025 \ "btrfs: fix transaction abort when snapshotting received subvolumes" # Use a 4K node/leaf size to make the test faster. diff --git a/tests/btrfs/346 b/tests/btrfs/346 index ef301ef7..28c1e536 100755 --- a/tests/btrfs/346 +++ b/tests/btrfs/346 @@ -14,7 +14,7 @@ _begin_fstest auto quick subvol _require_scratch _require_btrfs_support_sectorsize 4096 -_fixed_by_kernel_commit xxxxxxxxxxxx \ +_fixed_by_kernel_commit 2d1ababdedd4 \ "btrfs: fix transaction abort on file creation due to name hash collision" # Use a 4K node/leaf size to make the test faster and require less file names diff --git a/tests/btrfs/347 b/tests/btrfs/347 index ebd53d97..9239e99a 100755 --- a/tests/btrfs/347 +++ b/tests/btrfs/347 @@ -16,7 +16,7 @@ _require_test_program t_btrfs_received_uuid_ioctl _require_scratch _require_btrfs_support_sectorsize 4096 -_fixed_by_kernel_commit xxxxxxxxxxxx \ +_fixed_by_kernel_commit 87f2c46003fc \ "btrfs: fix transaction abort on set received ioctl due to item overflow" # Use a 4K node/leaf size to make the test faster. diff --git a/tests/generic/762 b/tests/generic/762 index e3a01de8..bbaf5051 100755 --- a/tests/generic/762 +++ b/tests/generic/762 @@ -10,7 +10,7 @@ . ./common/preamble _begin_fstest auto quota prealloc -_fixed_by_git_commit kernel XXXXXXXXXXXXXX \ +_fixed_by_fs_commit xfs 4b8d867ca6e2 \ "xfs: don't over-report free space or inodes in statvfs" . ./common/filter diff --git a/tests/generic/789 b/tests/generic/789 index 1ed7a885..0e72966e 100755 --- a/tests/generic/789 +++ b/tests/generic/789 @@ -24,7 +24,7 @@ _cleanup() _require_scratch _require_dm_target flakey -_fixed_by_fs_commit btrfs xxxxxxxxxxxx \ +_fixed_by_fs_commit btrfs 5254d4181add \ "btrfs: fix zero size inode with non-zero size after log replay" _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed" diff --git a/tests/generic/790 b/tests/generic/790 index 9aa577f5..28f7faa2 100755 --- a/tests/generic/790 +++ b/tests/generic/790 @@ -27,7 +27,7 @@ _cleanup() _require_scratch _require_dm_target flakey -_fixed_by_fs_commit btrfs xxxxxxxxxxxx \ +_fixed_by_fs_commit btrfs 9573a365ff9f \ "btrfs: log new dentries when logging parent dir of a conflicting inode" _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed"