diff options
| author | Filipe Manana <fdmanana@suse.com> | 2024-03-27 17:11:43 +0000 |
|---|---|---|
| committer | Anand Jain <anand.jain@oracle.com> | 2024-04-03 15:08:49 +0800 |
| commit | ec3953895cadd6650cb54fbeb0f481df1c43b3ac (patch) | |
| tree | 1069ed9ea5bcd403e9729c8c30291fab824f4bc8 | |
| parent | d2e240298b8c652b78ca5e8a3f13dc2a3f3066e8 (diff) | |
| download | xfstests-dev-ec3953895cadd6650cb54fbeb0f481df1c43b3ac.tar.gz | |
btrfs: remove stop file early at _btrfs_stress_subvolume
Instead of having every test case that uses _btrfs_stress_subvolume()
removing the stop file before calling that function, do the file
remove at _btrfs_stress_subvolume(). There's no point in doing it in
every single test case.
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
| -rw-r--r-- | common/btrfs | 1 | ||||
| -rwxr-xr-x | tests/btrfs/060 | 2 | ||||
| -rwxr-xr-x | tests/btrfs/065 | 2 | ||||
| -rwxr-xr-x | tests/btrfs/066 | 2 | ||||
| -rwxr-xr-x | tests/btrfs/067 | 2 | ||||
| -rwxr-xr-x | tests/btrfs/068 | 2 |
6 files changed, 1 insertions, 10 deletions
diff --git a/common/btrfs b/common/btrfs index 0f79b2510f..2c086227d8 100644 --- a/common/btrfs +++ b/common/btrfs @@ -341,6 +341,7 @@ _btrfs_stress_subvolume() local subvol_mnt=$4 local stop_file=$5 + rm -f $stop_file mkdir -p $subvol_mnt while [ ! -e $stop_file ]; do $BTRFS_UTIL_PROG subvolume create $btrfs_mnt/$subvol_name diff --git a/tests/btrfs/060 b/tests/btrfs/060 index 87823abad1..53cbd3a0d7 100755 --- a/tests/btrfs/060 +++ b/tests/btrfs/060 @@ -46,8 +46,6 @@ run_test() balance_pid=$! echo "$balance_pid" >>$seqres.full - # make sure the stop sign is not there - rm -f $stop_file echo -n "Start subvolume worker: " >>$seqres.full _btrfs_stress_subvolume $SCRATCH_DEV $SCRATCH_MNT subvol_$$ $subvol_mnt $stop_file >/dev/null 2>&1 & subvol_pid=$! diff --git a/tests/btrfs/065 b/tests/btrfs/065 index ddc286161f..f9e43cdc01 100755 --- a/tests/btrfs/065 +++ b/tests/btrfs/065 @@ -49,8 +49,6 @@ run_test() $FSSTRESS_PROG $args >>$seqres.full & fsstress_pid=$! - # make sure the stop sign is not there - rm -f $stop_file echo -n "Start subvolume worker: " >>$seqres.full _btrfs_stress_subvolume $SCRATCH_DEV $SCRATCH_MNT subvol_$$ $subvol_mnt $stop_file >/dev/null 2>&1 & subvol_pid=$! diff --git a/tests/btrfs/066 b/tests/btrfs/066 index c748860275..b6f904ac50 100755 --- a/tests/btrfs/066 +++ b/tests/btrfs/066 @@ -41,8 +41,6 @@ run_test() $FSSTRESS_PROG $args >>$seqres.full & fsstress_pid=$! - # make sure the stop sign is not there - rm -f $stop_file echo -n "Start subvolume worker: " >>$seqres.full _btrfs_stress_subvolume $SCRATCH_DEV $SCRATCH_MNT subvol_$$ $subvol_mnt $stop_file >/dev/null 2>&1 & subvol_pid=$! diff --git a/tests/btrfs/067 b/tests/btrfs/067 index ebbec1beec..7be09d52f1 100755 --- a/tests/btrfs/067 +++ b/tests/btrfs/067 @@ -42,8 +42,6 @@ run_test() $FSSTRESS_PROG $args >>$seqres.full & fsstress_pid=$! - # make sure the stop sign is not there - rm -f $stop_file echo -n "Start subvolume worker: " >>$seqres.full _btrfs_stress_subvolume $SCRATCH_DEV $SCRATCH_MNT subvol_$$ $subvol_mnt $stop_file >/dev/null 2>&1 & subvol_pid=$! diff --git a/tests/btrfs/068 b/tests/btrfs/068 index 5f41fb7428..19e3701023 100755 --- a/tests/btrfs/068 +++ b/tests/btrfs/068 @@ -42,8 +42,6 @@ run_test() $FSSTRESS_PROG $args >>$seqres.full & fsstress_pid=$! - # make sure the stop sign is not there - rm -f $stop_file echo -n "Start subvolume worker: " >>$seqres.full _btrfs_stress_subvolume $SCRATCH_DEV $SCRATCH_MNT subvol_$$ $subvol_mnt $stop_file >/dev/null 2>&1 & subvol_pid=$! |