Skip to content

Commit

Permalink
fstests: add missing commit IDs to some tests
Browse files Browse the repository at this point in the history
Some tests are still using a 'xxx...' commit ID but the respective patches
were already merged to Linus' tree or btrfs-progs, so update them with the
correct commit IDs and in two cases update the subject as well, because it
was modified after the test case was added and before being sent to Linus
(btrfs/317 and generic/707).

Signed-off-by: Filipe Manana <[email protected]>
Reviewed-by: Zorro Lang <[email protected]>
Signed-off-by: Zorro Lang <[email protected]>
  • Loading branch information
fdmanana authored and Zorro Lang committed Mar 13, 2024
1 parent c9d50e4 commit ec5b77f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion tests/btrfs/249
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _require_command "$WIPEFS_PROG" wipefs
_require_btrfs_forget_or_module_loadable
_wants_kernel_commit a26d60dedf9a \
"btrfs: sysfs: add devinfo/fsid to retrieve actual fsid from the device"
_fixed_by_git_commit btrfs-progs xxxxxxxxxxxx \
_fixed_by_git_commit btrfs-progs 32c2e57c65b9 \
"btrfs-progs: read fsid from the sysfs in device_is_seed"

_scratch_dev_pool_get 2
Expand Down
2 changes: 1 addition & 1 deletion tests/btrfs/303
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ _require_test
_require_scratch
_require_xfs_io_command "fiemap"

_fixed_by_kernel_commit XXXXXXXXXXXX \
_fixed_by_kernel_commit 5897710b28ca \
"btrfs: send: don't issue unnecessary zero writes for trailing hole"

send_files_dir=$TEST_DIR/btrfs-test-$seq
Expand Down
2 changes: 1 addition & 1 deletion tests/btrfs/309
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ _begin_fstest auto quick snapshot subvol
_supported_fs btrfs
_require_scratch
_require_test_program t_snapshot_deleted_subvolume
_fixed_by_kernel_commit XXXXXXXXXXXX \
_fixed_by_kernel_commit 7081929ab257 \
"btrfs: don't abort filesystem when attempting to snapshot deleted subvolume"

_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
Expand Down
2 changes: 1 addition & 1 deletion tests/btrfs/316
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ _begin_fstest auto quick qgroup
_supported_fs btrfs
_require_scratch

_fixed_by_kernel_commit xxxxxxxxxxxx \
_fixed_by_kernel_commit d139ded8b9cd \
"btrfs: qgroup: always free reserved space for extent records"

_scratch_mkfs >> $seqres.full
Expand Down
4 changes: 2 additions & 2 deletions tests/btrfs/317
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
. ./common/preamble
_begin_fstest auto volume raid convert

_fixed_by_kernel_commit XXXXXXXXXX \
"btrfs: zoned: don't skip block group profile checks on conv zones"
_fixed_by_kernel_commit 5906333cc4af \
"btrfs: zoned: don't skip block group profile checks on conventional zones"

. common/filter.btrfs

Expand Down
4 changes: 2 additions & 2 deletions tests/generic/707
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ _require_scratch

_fixed_by_kernel_commit f950fd052913 \
"udf: Protect rename against modification of moved directory"
_fixed_by_kernel_commit XXXXXXXXXXXX \
"ext4: fix possible corruption when moving a directory"
_fixed_by_kernel_commit 0813299c586b \
"ext4: Fix possible corruption when moving a directory"

_scratch_mkfs >>$seqres.full 2>&1
_scratch_mount
Expand Down

0 comments on commit ec5b77f

Please sign in to comment.