btrfs/057: Update test case to keep subvolume in any kernel version

Since commit a79a464d5675 ("btrfs: Allow rmdir(2) to delete an empty
subvolume"), rm -r can delete a subvolume too.

This test assumes that rm -r does not delete a subvolume.
Currently the commit does not affect the test since qgroup items
still exist after subvolume deletion, but we plan to change the
behavior and remove them along with subvolume deletion.

So update the test and keep subvolume (and qgroup item) in any kernel
version.

Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Misono Tomohiro
2018-08-03 15:44:37 +09:00
committed by Eryu Guan
parent df949b94f0
commit 631dd76a31
+3 -2
View File
@@ -53,8 +53,9 @@ run_check $FSSTRESS_PROG -d $SCRATCH_MNT/snap1 -w -p 5 -n 1000 \
_run_btrfs_util_prog quota enable $SCRATCH_MNT
_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
# ignore removing subvolume errors
rm -rf $SCRATCH_MNT/* >& /dev/null
# remove all file/dir other than subvolume
rm -rf $SCRATCH_MNT/snap1/* >& /dev/null
rm -rf $SCRATCH_MNT/p* >& /dev/null
_run_btrfs_util_prog filesystem sync $SCRATCH_MNT
units=`_btrfs_qgroup_units`