From 976ca65307d2f0d16acb523833d15437bd0349f8 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 2 Mar 2021 15:22:56 -0800 Subject: [PATCH] generic/60[78]: ensure the initial DAX file flag state before test Since this test checks the behaviors of both the in-core S_DAX flag and the ondisk FS_XFLAG_DAX inode flags, it must be careful about the initial state of the filesystem w.r.t. the inode flag. Make sure that the root directory does /not/ have the inode flag set before we begin testing, so that the initial state doesn't throw off inheritance testing. [Eryu: change chattr command to xfs_io -c 'chattr'] Signed-off-by: Darrick J. Wong Reviewed-by: Chandan Babu R Signed-off-by: Eryu Guan --- tests/generic/607 | 4 ++++ tests/generic/608 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/tests/generic/607 b/tests/generic/607 index dd6dbd65..db4e7cf1 100755 --- a/tests/generic/607 +++ b/tests/generic/607 @@ -156,6 +156,10 @@ do_xflag_tests() local option=$1 _scratch_mount "$option" + + # Make sure the root dir doesn't have FS_XFLAG_DAX set before we start. + $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT &>> $seqres.full + cd $SCRATCH_MNT for i in $(seq 1 5); do diff --git a/tests/generic/608 b/tests/generic/608 index dd89d91c..861bbff5 100755 --- a/tests/generic/608 +++ b/tests/generic/608 @@ -98,6 +98,9 @@ do_tests() _scratch_mount "$mount_option" + # Make sure the root dir doesn't have FS_XFLAG_DAX set before we start. + $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT &>> $seqres.full + test_drop_caches test_cycle_mount "$cycle_mount_option" -- 2.39.5