On Mon, Jun 21, 2021 at 12:48:51PM -0400, Theodore Ts'o wrote: > 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 <tytso@xxxxxxx> > Cc: Leah Rumancik <leah.rumancik@xxxxxxxxx> > --- > tests/ext4/048 | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tests/ext4/048 b/tests/ext4/048 > index 51189618..35e6aa7f 100755 > --- a/tests/ext4/048 > +++ b/tests/ext4/048 > @@ -93,6 +93,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 What if checkpoint_journal is not there? Should the test be skipped in that case as well? -Leah > + > blocksize="$(_get_block_size $SCRATCH_MNT)" > mkdir $testdir > file_num=1 > -- > 2.31.0 >
