From: Theodore Ts'o Date: Mon, 21 Jun 2021 16:48:51 +0000 (-0400) Subject: ext4/048: skip test of filename wipe if journal checkpoint is not supported X-Git-Tag: v2022.05.01~346 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=3ff9e88c096a87dc53312484c07e4caeac6661e2 ext4/048: skip test of filename wipe if journal checkpoint is not supported ext4/048 will fail when running on older kernels that don't support the filename wipe feature. The journal checkpoint ioctl is a related feature, and landed just a little bit after filename wipe feature, so use support for the journal checkpoint ioctl as a proxy for support for the filename wipe feature. Without this change, this test will fail when tesing 5.10, 5.4, and other LTS kernels. Signed-off-by: Theodore Ts'o Cc: Leah Rumancik Tested-by: Yang Xu Reviewed-by: Leah Rumancik Signed-off-by: Eryu Guan --- diff --git a/tests/ext4/048 b/tests/ext4/048 index 3f077b00..c23c0ea3 100755 --- a/tests/ext4/048 +++ b/tests/ext4/048 @@ -86,6 +86,14 @@ _scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seqres.full 2>&1 # create scratch dir for testing # create some files with no name a substr of another name so we can grep later _scratch_mount >> $seqres.full 2>&1 + +# Use the presence of the journal checkpoint ioctl as a proxy of filename +# wipe being supported +if test -x $here/src/checkpoint_journal && \ + ! $here/src/checkpoint_journal $SCRATCH_MNT --dry-run ; then + _notrun "filename wipe not supported" +fi + blocksize="$(_get_block_size $SCRATCH_MNT)" mkdir $testdir file_num=1