From: Qu Wenruo Date: Fri, 12 Apr 2024 04:41:16 +0000 (+0930) Subject: fstests: btrfs: rename _run_btrfs_util_prog to _btrfs X-Git-Tag: v2024.04.28~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64e7009c2c68bb9d031c0e993c9176e781964ed5;p=xfstests-dev.git fstests: btrfs: rename _run_btrfs_util_prog to _btrfs For simple btrfs commands like "btrfs subvolume create", the output is only informative, meanwhile the output format may still change in the future. Normally we already have quite some test cases just redirect the output for null or seqres.full, without knowing we have a better suitable function `_run_btrfs_util_prog()` already. This patch firstly rename the function to a much shorter name `_btrfs`, then move it to the top of `common/btrfs`, and add a comment recommending to use it when possible. The use of `_btrfs` mostly matches the real world usage of btrfs-progs (just "btrfs" command), and no need to do any filtering or redirection, and would be the recommended way for future test cases. Reviewed-by: Anand Jain Signed-off-by: Qu Wenruo Signed-off-by: Anand Jain --- diff --git a/common/btrfs b/common/btrfs index bc769cc4..06ea63e8 100644 --- a/common/btrfs +++ b/common/btrfs @@ -4,6 +4,12 @@ . common/module +# The recommended way to execute simple "btrfs" command. +_btrfs() +{ + run_check $BTRFS_UTIL_PROG $* +} + _btrfs_get_subvolid() { local mnt=$1 @@ -70,11 +76,6 @@ _require_btrfs_dump_super() fi } -_run_btrfs_util_prog() -{ - run_check $BTRFS_UTIL_PROG $* -} - _require_btrfs_mkfs_feature() { if [ -z $1 ]; then @@ -855,14 +856,14 @@ _qgroup_rescan() local dev=$(findmnt -n -o SOURCE $mnt) _check_regular_qgroup $dev || return 1 - _run_btrfs_util_prog quota rescan -w $mnt + _btrfs quota rescan -w $mnt } _require_qgroup_rescan() { _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount - _run_btrfs_util_prog quota enable $SCRATCH_MNT + _btrfs quota enable $SCRATCH_MNT # Wait for the first rescan. $BTRFS_UTIL_PROG quota rescan -W $SCRATCH_MNT || \ _notrun "not able to wait on a quota rescan" diff --git a/tests/btrfs/004 b/tests/btrfs/004 index 2d2841ff..00a516c3 100755 --- a/tests/btrfs/004 +++ b/tests/btrfs/004 @@ -164,7 +164,7 @@ workout() run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p $procs -n 2000 \ $FSSTRESS_AVOID - _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT \ + _btrfs subvolume snapshot $SCRATCH_MNT \ $SCRATCH_MNT/$snap_name run_check _scratch_unmount >/dev/null 2>&1 diff --git a/tests/btrfs/007 b/tests/btrfs/007 index 2e0a918e..333524e2 100755 --- a/tests/btrfs/007 +++ b/tests/btrfs/007 @@ -50,7 +50,7 @@ workout() run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n $ops $FSSTRESS_AVOID -x \ "$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/base" - _run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/incr + _btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/incr echo "# $BTRFS_UTIL_PROG send $SCRATCH_MNT/base > ${send_files_dir}/base.snap" \ >> $seqres.full @@ -74,10 +74,10 @@ workout() || _fail "size=$fsz mkfs failed" _scratch_mount "-o noatime" - _run_btrfs_util_prog receive $SCRATCH_MNT < $send_files_dir/base.snap + _btrfs receive $SCRATCH_MNT < $send_files_dir/base.snap run_check $FSSUM_PROG -r $send_files_dir/base.fssum $SCRATCH_MNT/base - _run_btrfs_util_prog receive $SCRATCH_MNT < $send_files_dir/incr.snap + _btrfs receive $SCRATCH_MNT < $send_files_dir/incr.snap run_check $FSSUM_PROG -r $send_files_dir/incr.fssum $SCRATCH_MNT/incr } diff --git a/tests/btrfs/011 b/tests/btrfs/011 index ea825ce5..bf63a72b 100755 --- a/tests/btrfs/011 +++ b/tests/btrfs/011 @@ -129,12 +129,12 @@ workout() _require_fs_space $SCRATCH_MNT $((2 * 512 * 1024)) #2.5G fill_scratch $fssize $with_cancel - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT echo -e "Replace from $source_dev to $SPARE_DEV\\n" >> $seqres.full btrfs_replace_test $source_dev $SPARE_DEV "" $with_cancel $quick - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT # Skip -r test for configs without mirror OR replace cancel if echo $mkfs_options | grep -E -qv "raid1|raid5|raid6|raid10" || \ @@ -173,7 +173,7 @@ btrfs_replace_test() if [ "${with_cancel}Q" = "cancelQ" ]; then # background the replace operation (no '-B' option given) - _run_btrfs_util_prog replace start -f $replace_options $source_dev $target_dev $SCRATCH_MNT + _btrfs replace start -f $replace_options $source_dev $target_dev $SCRATCH_MNT sleep $wait_time $BTRFS_UTIL_PROG replace cancel $SCRATCH_MNT 2>&1 >> $seqres.full @@ -201,7 +201,7 @@ btrfs_replace_test() # replace operation. (sleep $wait_time; sync) > /dev/null 2>&1 & fi - _run_btrfs_util_prog replace start -Bf $replace_options $source_dev $target_dev $SCRATCH_MNT + _btrfs replace start -Bf $replace_options $source_dev $target_dev $SCRATCH_MNT $BTRFS_UTIL_PROG replace status $SCRATCH_MNT > $tmp.tmp 2>&1 cat $tmp.tmp >> $seqres.full @@ -219,7 +219,7 @@ btrfs_replace_test() # exit values != 0, including detected correctable and uncorrectable # errors on the device. sync; sync - _run_btrfs_util_prog scrub start -B $SCRATCH_MNT + _btrfs scrub start -B $SCRATCH_MNT # Two tests are performed, the 1st is to btrfsck the filesystem, # and the 2nd test is to mount the filesystem. diff --git a/tests/btrfs/017 b/tests/btrfs/017 index aa5b7c1d..b512098e 100755 --- a/tests/btrfs/017 +++ b/tests/btrfs/017 @@ -35,7 +35,7 @@ EXTENT_SIZE=$((2 * $BLOCK_SIZE)) $XFS_IO_PROG -f -d -c "pwrite 0 $EXTENT_SIZE" $SCRATCH_MNT/foo \ | _filter_xfs_io_blocks_modified -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap +_btrfs subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap $CLONER_PROG -s 0 -d 0 -l $EXTENT_SIZE $SCRATCH_MNT/foo $SCRATCH_MNT/foo-reflink @@ -45,8 +45,8 @@ $CLONER_PROG -s 0 -d 0 -l $EXTENT_SIZE $SCRATCH_MNT/foo \ $CLONER_PROG -s 0 -d 0 -l $EXTENT_SIZE $SCRATCH_MNT/foo \ $SCRATCH_MNT/snap/foo-reflink2 -_run_btrfs_util_prog quota enable $SCRATCH_MNT -_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT +_btrfs quota rescan -w $SCRATCH_MNT rm -fr $SCRATCH_MNT/foo* rm -fr $SCRATCH_MNT/snap/foo* diff --git a/tests/btrfs/022 b/tests/btrfs/022 index 786283e9..dc88329c 100755 --- a/tests/btrfs/022 +++ b/tests/btrfs/022 @@ -23,10 +23,10 @@ _require_no_compress _limit_test_exceed() { echo "=== limit exceed test ===" >> $seqres.full - _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a - _run_btrfs_util_prog quota enable $SCRATCH_MNT + _btrfs subvolume create $SCRATCH_MNT/a + _btrfs quota enable $SCRATCH_MNT subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) - _run_btrfs_util_prog qgroup limit 5M 0/$subvolid $SCRATCH_MNT + _btrfs qgroup limit 5M 0/$subvolid $SCRATCH_MNT _ddt of=$SCRATCH_MNT/a/file bs=10M count=1 >> $seqres.full 2>&1 [ $? -ne 0 ] || _fail "quota should have limited us" } diff --git a/tests/btrfs/025 b/tests/btrfs/025 index 1c3773be..bd54d3c5 100755 --- a/tests/btrfs/025 +++ b/tests/btrfs/025 @@ -31,25 +31,25 @@ _scratch_mkfs >/dev/null 2>&1 _scratch_mount run_check $XFS_IO_PROG -f -c "truncate 819200" $SCRATCH_MNT/foo -_run_btrfs_util_prog filesystem sync $SCRATCH_MNT +_btrfs filesystem sync $SCRATCH_MNT run_check $XFS_IO_PROG -c "falloc -k 819200 667648" $SCRATCH_MNT/foo -_run_btrfs_util_prog filesystem sync $SCRATCH_MNT +_btrfs filesystem sync $SCRATCH_MNT run_check $XFS_IO_PROG -c "pwrite 1482752 2978" $SCRATCH_MNT/foo -_run_btrfs_util_prog filesystem sync $SCRATCH_MNT +_btrfs filesystem sync $SCRATCH_MNT -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \ +_btrfs subvolume snapshot -r $SCRATCH_MNT \ $SCRATCH_MNT/mysnap1 run_check $XFS_IO_PROG -c "truncate 883305" $SCRATCH_MNT/foo -_run_btrfs_util_prog filesystem sync $SCRATCH_MNT +_btrfs filesystem sync $SCRATCH_MNT -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \ +_btrfs subvolume snapshot -r $SCRATCH_MNT \ $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ $SCRATCH_MNT/mysnap2 2>&1 md5sum $SCRATCH_MNT/foo | _filter_scratch @@ -61,10 +61,10 @@ _check_btrfs_filesystem $SCRATCH_DEV _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT md5sum $SCRATCH_MNT/mysnap1/foo | _filter_scratch -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT md5sum $SCRATCH_MNT/mysnap2/foo | _filter_scratch _scratch_unmount diff --git a/tests/btrfs/028 b/tests/btrfs/028 index 11eaecd2..831875d3 100755 --- a/tests/btrfs/028 +++ b/tests/btrfs/028 @@ -22,7 +22,7 @@ _require_btrfs_qgroup_report _scratch_mkfs >/dev/null _scratch_mount -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT _qgroup_rescan $SCRATCH_MNT # Increase the probability of generating de-refer extent, and decrease diff --git a/tests/btrfs/030 b/tests/btrfs/030 index 5b91dd21..9dcbb550 100755 --- a/tests/btrfs/030 +++ b/tests/btrfs/030 @@ -81,7 +81,7 @@ echo "ola" > $SCRATCH_MNT/a/b/bar1/bar2/bar3/bar4/hello.txt # |-- bar4 (ino 275) # |--hello.txt (ino 276) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 echo " world" >> $SCRATCH_MNT/a/b/c/file.txt mv $SCRATCH_MNT/a/b/c/d $SCRATCH_MNT/a/b/c2/d2 @@ -135,14 +135,14 @@ mv $SCRATCH_MNT/a/b/bar1 $SCRATCH_MNT/a/b/k44/bar3/bar2/k11 # |-- bar2/ (ino 273) # |-- k11/ (ino 272) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -f $tmp/2.snap -p $SCRATCH_MNT/mysnap1 \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -f $tmp/2.snap -p $SCRATCH_MNT/mysnap1 \ $SCRATCH_MNT/mysnap2 _scratch_unmount @@ -150,10 +150,10 @@ _check_btrfs_filesystem $SCRATCH_DEV _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 2>> $seqres.full -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 2>> $seqres.full _scratch_unmount diff --git a/tests/btrfs/034 b/tests/btrfs/034 index f2759826..ce8c1bfa 100755 --- a/tests/btrfs/034 +++ b/tests/btrfs/034 @@ -43,14 +43,14 @@ do $SCRATCH_MNT/foo | _filter_xfs_io done -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 $XFS_IO_PROG -c "truncate 3882008" $SCRATCH_MNT/foo -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -f $tmp/2.snap -p $SCRATCH_MNT/mysnap1 \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -f $tmp/2.snap -p $SCRATCH_MNT/mysnap1 \ $SCRATCH_MNT/mysnap2 md5sum $SCRATCH_MNT/foo | _filter_scratch @@ -62,10 +62,10 @@ _check_btrfs_filesystem $SCRATCH_DEV _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT md5sum $SCRATCH_MNT/mysnap1/foo | _filter_scratch -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT md5sum $SCRATCH_MNT/mysnap2/foo | _filter_scratch _scratch_unmount diff --git a/tests/btrfs/038 b/tests/btrfs/038 index f2f35a6b..3424e511 100755 --- a/tests/btrfs/038 +++ b/tests/btrfs/038 @@ -37,7 +37,7 @@ $XFS_IO_PROG -f -c "truncate 118811" $SCRATCH_MNT/foo $XFS_IO_PROG -c "pwrite -S 0x0d -b 39987 92267 39987" \ $SCRATCH_MNT/foo | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \ +_btrfs subvolume snapshot -r $SCRATCH_MNT \ $SCRATCH_MNT/mysnap1 $XFS_IO_PROG -c "pwrite -S 0x3e -b 80000 200000 80000" \ @@ -45,7 +45,7 @@ $XFS_IO_PROG -c "pwrite -S 0x3e -b 80000 200000 80000" \ # Sync to avoid btrfs merging file extent items, which would make the test # succeed when it should fail. -_run_btrfs_util_prog filesystem sync $SCRATCH_MNT +_btrfs filesystem sync $SCRATCH_MNT $XFS_IO_PROG -c "pwrite -S 0xdc -b 10000 250000 10000" \ $SCRATCH_MNT/foo | _filter_xfs_io @@ -53,10 +53,10 @@ $XFS_IO_PROG -c "pwrite -S 0xff -b 10000 300000 10000" \ $SCRATCH_MNT/foo | _filter_xfs_io # will be used for incremental send to be able to issue clone operations -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \ +_btrfs subvolume snapshot -r $SCRATCH_MNT \ $SCRATCH_MNT/clones_snap -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT \ +_btrfs subvolume snapshot -r $SCRATCH_MNT \ $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 @@ -65,9 +65,9 @@ run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ run_check $FSSUM_PROG -A -f -w $tmp/clones.fssum $SCRATCH_MNT/clones_snap \ -x $SCRATCH_MNT/clones_snap/mysnap1 -x $SCRATCH_MNT/clones_snap/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -f $tmp/clones.snap $SCRATCH_MNT/clones_snap -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -f $tmp/clones.snap $SCRATCH_MNT/clones_snap +_btrfs send -p $SCRATCH_MNT/mysnap1 \ -c $SCRATCH_MNT/clones_snap -f $tmp/2.snap $SCRATCH_MNT/mysnap2 _scratch_unmount @@ -76,13 +76,13 @@ _check_btrfs_filesystem $SCRATCH_DEV _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 2>> $seqres.full -_run_btrfs_util_prog receive -f $tmp/clones.snap $SCRATCH_MNT +_btrfs receive -f $tmp/clones.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/clones.fssum $SCRATCH_MNT/clones_snap 2>> $seqres.full -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 2>> $seqres.full _scratch_unmount diff --git a/tests/btrfs/039 b/tests/btrfs/039 index bcc9d58a..2e76bdd8 100755 --- a/tests/btrfs/039 +++ b/tests/btrfs/039 @@ -56,7 +56,7 @@ mv $SCRATCH_MNT/e $SCRATCH_MNT/a/b/f/g # |-- g (ino 263) # |-- e (ino 261) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 mv $SCRATCH_MNT/a/b/c $SCRATCH_MNT/a/b/x mv $SCRATCH_MNT/a/b/x/d $SCRATCH_MNT/a/b/x/y @@ -75,14 +75,14 @@ mv $SCRATCH_MNT/a/b/w/g/e $SCRATCH_MNT/a/b/w/g/z # |-- g (ino 263) # |-- z (ino 261) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ $SCRATCH_MNT/mysnap2 _scratch_unmount @@ -91,10 +91,10 @@ _check_btrfs_filesystem $SCRATCH_DEV _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 2>> $seqres.full -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 2>> $seqres.full _scratch_unmount diff --git a/tests/btrfs/040 b/tests/btrfs/040 index da5ec1fa..7dd907d5 100755 --- a/tests/btrfs/040 +++ b/tests/btrfs/040 @@ -54,7 +54,7 @@ ln $SCRATCH_MNT/a/b/c/foo.txt $SCRATCH_MNT/a/b/baz.txt # | # |-- baz.txt (ino 261) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 rm -f $SCRATCH_MNT/a/b/c/foo.txt rm -f $SCRATCH_MNT/a/b/c/bar.txt @@ -68,14 +68,14 @@ rmdir $SCRATCH_MNT/a/b/c # |-- b/ (ino 258) # |-- baz.txt (ino 261) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ $SCRATCH_MNT/mysnap2 _scratch_unmount @@ -84,10 +84,10 @@ _check_btrfs_filesystem $SCRATCH_DEV _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 2>> $seqres.full -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 2>> $seqres.full _scratch_unmount diff --git a/tests/btrfs/041 b/tests/btrfs/041 index 35f058fa..f69836b5 100755 --- a/tests/btrfs/041 +++ b/tests/btrfs/041 @@ -73,7 +73,7 @@ test_btrfs_restore() # read compressed file extents that have a non-zero data offset field, # resulting either in decompression failure or reading a wrong section # of the extent. - _run_btrfs_util_prog restore $SCRATCH_DEV $restore_dir + _btrfs restore $SCRATCH_DEV $restore_dir md5sum $restore_dir/foo | cut -d ' ' -f 1 } diff --git a/tests/btrfs/042 b/tests/btrfs/042 index 89742303..63d14bcc 100755 --- a/tests/btrfs/042 +++ b/tests/btrfs/042 @@ -20,13 +20,13 @@ _scratch_mount LIMIT_SIZE=$((10 * 1024 * 1024)) -_run_btrfs_util_prog quota enable $SCRATCH_MNT -_run_btrfs_util_prog qgroup create 1/1 $SCRATCH_MNT -_run_btrfs_util_prog qgroup limit $LIMIT_SIZE 1/1 $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT +_btrfs qgroup create 1/1 $SCRATCH_MNT +_btrfs qgroup limit $LIMIT_SIZE 1/1 $SCRATCH_MNT for i in `seq 10 -1 1`; do #add newly created subvolume qgroup to it's parent qgroup - _run_btrfs_util_prog subvolume create -i 1/1 \ + _btrfs subvolume create -i 1/1 \ $SCRATCH_MNT/subv_$i done @@ -37,7 +37,7 @@ for i in `seq 10 -1 1`; do done wait -_run_btrfs_util_prog filesystem sync $SCRATCH_MNT \ +_btrfs filesystem sync $SCRATCH_MNT \ >>$seqres.full 2>&1 total_written=0 diff --git a/tests/btrfs/043 b/tests/btrfs/043 index 788806b3..9fc2c6a2 100755 --- a/tests/btrfs/043 +++ b/tests/btrfs/043 @@ -66,7 +66,7 @@ mkdir $SCRATCH_MNT/a/b/d4 # | # |-- d4/ (ino 270) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 rm -f $SCRATCH_MNT/a/b/c/foo.txt mv $SCRATCH_MNT/a/b/y $SCRATCH_MNT/a/b/YY @@ -97,14 +97,14 @@ rmdir $SCRATCH_MNT/a/b/d1 # |-- d2/ (ino 268) # |-- d3/ (ino 269) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ $SCRATCH_MNT/mysnap2 _check_scratch_fs @@ -113,10 +113,10 @@ _scratch_unmount _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 status=0 diff --git a/tests/btrfs/044 b/tests/btrfs/044 index 1a8f225a..71c64051 100755 --- a/tests/btrfs/044 +++ b/tests/btrfs/044 @@ -55,7 +55,7 @@ chmod 0777 $SCRATCH_MNT/a/b/c/d/e # | # |-- f/ (ino 263) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 echo 'mundo' >> $SCRATCH_MNT/a/b/c/d/e/file.txt mv $SCRATCH_MNT/a/b/c/d/e/file.txt $SCRATCH_MNT/a/b/c/d/e/file2.txt @@ -77,14 +77,14 @@ chmod 0700 $SCRATCH_MNT/a/b/f2/e2 # |-- e2 (ino 261) # |-- file2.txt (ino 263) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ $SCRATCH_MNT/mysnap2 _check_scratch_fs @@ -93,10 +93,10 @@ _scratch_unmount _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 status=0 diff --git a/tests/btrfs/045 b/tests/btrfs/045 index 04ba8ea0..90fda6e2 100755 --- a/tests/btrfs/045 +++ b/tests/btrfs/045 @@ -184,7 +184,7 @@ mkdir $SCRATCH_MNT/%a/%c/%e # |-- %c/ (ino 305) # |-- %e/ (ino 307) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # case 1), mentioned above ln $SCRATCH_MNT/a/c/b2/file4 $SCRATCH_MNT/a/c/b2/f/file6 @@ -323,15 +323,15 @@ mv $SCRATCH_MNT/%a/foo $SCRATCH_MNT/%a/%b/%g/%e2/%f2 # |-- %c2/ (ino 305) # |-- foo (ino 316) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $tmp/2.snap \ $SCRATCH_MNT/mysnap2 _check_scratch_fs @@ -340,10 +340,10 @@ _scratch_unmount _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 status=0 diff --git a/tests/btrfs/046 b/tests/btrfs/046 index f0b08b6c..7f6b92a1 100755 --- a/tests/btrfs/046 +++ b/tests/btrfs/046 @@ -43,7 +43,7 @@ _scratch_mount $XFS_IO_PROG -f -c "falloc -k 0 268435456" $SCRATCH_MNT/foo -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap0 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap0 $XFS_IO_PROG -c "pwrite -S 0x01 -b 9216 16190218 9216" $SCRATCH_MNT/foo \ | _filter_xfs_io @@ -248,12 +248,12 @@ $XFS_IO_PROG -c "pwrite -S 0xa9 -b 9216 18423680 9216" $SCRATCH_MNT/foo \ $XFS_IO_PROG -c "pwrite -S 0xb0 -b 1121 165901483 1121" $SCRATCH_MNT/foo \ | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 $XFS_IO_PROG -c "pwrite -S 0xff -b 10 16190218 10" $SCRATCH_MNT/foo \ | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 echo "File digests in the original filesystem:" md5sum $SCRATCH_MNT/foo | _filter_scratch @@ -261,8 +261,8 @@ md5sum $SCRATCH_MNT/mysnap0/foo | _filter_scratch md5sum $SCRATCH_MNT/mysnap1/foo | _filter_scratch md5sum $SCRATCH_MNT/mysnap2/foo | _filter_scratch -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 _check_scratch_fs @@ -270,8 +270,8 @@ _scratch_unmount _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT echo "File digests in the replica filesystem:" md5sum $SCRATCH_MNT/mysnap1/foo | _filter_scratch diff --git a/tests/btrfs/048 b/tests/btrfs/048 index 52cc2bf8..2b0a6258 100755 --- a/tests/btrfs/048 +++ b/tests/btrfs/048 @@ -55,7 +55,7 @@ $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir label 2>&1 | echo "***" echo -e "\nTesting subvolume ro property" -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/sv1 +_btrfs subvolume create $SCRATCH_MNT/sv1 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/sv1 ro echo "***" $BTRFS_UTIL_PROG property set $SCRATCH_MNT/sv1 ro foo 2>&1 | @@ -147,12 +147,12 @@ $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/subdir1 compression $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/subdir1/foobar compression echo "***" -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 touch $SCRATCH_MNT/testdir/subdir1/foobar2 -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 _scratch_unmount @@ -160,8 +160,8 @@ _check_scratch_fs _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT $BTRFS_UTIL_PROG property get $SCRATCH_MNT/mysnap2/testdir/subdir1 compression $BTRFS_UTIL_PROG property get $SCRATCH_MNT/mysnap2/testdir/subdir1/foobar \ compression @@ -192,7 +192,7 @@ touch $SCRATCH_MNT/dir1/subdir1/foo $BTRFS_UTIL_PROG property get $SCRATCH_MNT/dir1/subdir1/foo compression echo -e "\nTesting subvolume property inheritance" -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/sv1 +_btrfs subvolume create $SCRATCH_MNT/sv1 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/sv1 compression touch $SCRATCH_MNT/sv1/file2 $BTRFS_UTIL_PROG property get $SCRATCH_MNT/sv1/file2 compression diff --git a/tests/btrfs/050 b/tests/btrfs/050 index 7096eb83..da268480 100755 --- a/tests/btrfs/050 +++ b/tests/btrfs/050 @@ -66,9 +66,9 @@ for i in `seq 1 $NUM_LINKS`; do rm -f $TEST_PATH/foobar_link_`printf "%04d" $i` done -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 _scratch_unmount _check_scratch_fs @@ -76,7 +76,7 @@ _check_scratch_fs _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 status=0 diff --git a/tests/btrfs/051 b/tests/btrfs/051 index 743dfd66..468fac12 100755 --- a/tests/btrfs/051 +++ b/tests/btrfs/051 @@ -42,9 +42,9 @@ TEST_PATH="$SCRATCH_MNT/fdmanana/.config/google-chrome-mysetup/Default/Pepper_Da mkdir -p $TEST_PATH echo "hello world" > $TEST_PATH/amaiAdvancedStreamingPlugin.txt -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 _scratch_unmount _check_scratch_fs @@ -52,7 +52,7 @@ _check_scratch_fs _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 status=0 diff --git a/tests/btrfs/052 b/tests/btrfs/052 index eabe43c4..09f03f8a 100755 --- a/tests/btrfs/052 +++ b/tests/btrfs/052 @@ -122,7 +122,7 @@ test_btrfs_clone_same_file() # Check that after defragmenting the file and re-mounting, the file # content remains exactly the same as before. - _run_btrfs_util_prog filesystem defragment $SCRATCH_MNT/foo + _btrfs filesystem defragment $SCRATCH_MNT/foo _scratch_cycle_mount od -t x1 $SCRATCH_MNT/foo | _filter_od diff --git a/tests/btrfs/053 b/tests/btrfs/053 index 7f533bf4..abfe372a 100755 --- a/tests/btrfs/053 +++ b/tests/btrfs/053 @@ -50,7 +50,7 @@ echo "hello world" > $SCRATCH_MNT/foobar $SETFATTR_PROG -n user.xattr_name_1 -v `$PERL_PROG -e 'print "A" x 6000;'` \ $SCRATCH_MNT/foobar -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 # Update existing xattr value and add a new xattr too. @@ -59,12 +59,12 @@ $SETFATTR_PROG -n user.xattr_name_1 -v `$PERL_PROG -e 'print "Z" x 6666;'` \ $SETFATTR_PROG -n user.xattr_name_2 -v `$PERL_PROG -e 'print "U" x 5555;'` \ $SCRATCH_MNT/foobar -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 _scratch_unmount @@ -73,10 +73,10 @@ _check_scratch_fs _scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 status=0 diff --git a/tests/btrfs/054 b/tests/btrfs/054 index daf3cb3d..e38c085a 100755 --- a/tests/btrfs/054 +++ b/tests/btrfs/054 @@ -47,22 +47,22 @@ _scratch_mkfs >/dev/null 2>&1 _scratch_mount mkdir $SCRATCH_MNT/testdir -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/first_subvol +_btrfs subvolume create $SCRATCH_MNT/first_subvol -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # Replace the directory testdir with a subvolume that has the same name. rmdir $SCRATCH_MNT/testdir -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/testdir +_btrfs subvolume create $SCRATCH_MNT/testdir # Delete the subvolume first_subvol and create a directory with the same name. -_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/first_subvol +_btrfs subvolume delete $SCRATCH_MNT/first_subvol mkdir $SCRATCH_MNT/first_subvol -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 _scratch_unmount @@ -71,11 +71,11 @@ _check_scratch_fs _scratch_mkfs >/dev/null 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT [ -e $SCRATCH_MNT/first_subvol ] && \ echo "Subvolume first_subvol was not supposed to be replicated by full send!" -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT [ -e $SCRATCH_MNT/testdir ] && \ echo "Directory testdir was supposed to be deleted after incremental send!" diff --git a/tests/btrfs/057 b/tests/btrfs/057 index 6cb001b7..56db3595 100755 --- a/tests/btrfs/057 +++ b/tests/btrfs/057 @@ -23,14 +23,14 @@ _scratch_mount run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p 5 -n 1000 \ $FSSTRESS_AVOID >&/dev/null -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT \ +_btrfs subvolume snapshot $SCRATCH_MNT \ $SCRATCH_MNT/snap1 run_check $FSSTRESS_PROG -d $SCRATCH_MNT/snap1 -w -p 5 -n 1000 \ $FSSTRESS_AVOID >&/dev/null -_run_btrfs_util_prog quota enable $SCRATCH_MNT -_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT +_btrfs quota rescan -w $SCRATCH_MNT echo "Silence is golden" # btrfs check will detect any qgroup number mismatch. diff --git a/tests/btrfs/058 b/tests/btrfs/058 index ad7f850f..6df1c50d 100755 --- a/tests/btrfs/058 +++ b/tests/btrfs/058 @@ -48,8 +48,8 @@ sleep 3 # With the tmpfile open, create a RO snapshot and use it for a send operation. # The send operation used to fail with -ESTALE due to the presence of the # orphan inode. -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap -_run_btrfs_util_prog send -f /dev/null $SCRATCH_MNT/mysnap +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap +_btrfs send -f /dev/null $SCRATCH_MNT/mysnap status=0 exit diff --git a/tests/btrfs/077 b/tests/btrfs/077 index 7a69b98f..cce054f8 100755 --- a/tests/btrfs/077 +++ b/tests/btrfs/077 @@ -65,7 +65,7 @@ mkdir -p $SCRATCH_MNT/Z/Z2 # |---- Z/ (ino 265) # |---- Z2/ (ino 266) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 mkdir $SCRATCH_MNT/OSD mv $SCRATCH_MNT/merlin/RC/OSD $SCRATCH_MNT/OSD/OSD-Plane_788 @@ -96,14 +96,14 @@ mv $SCRATCH_MNT/OSDz $SCRATCH_MNT/fdm/RCz # |---- Sourcez/ (ino 264) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 _check_scratch_fs @@ -112,10 +112,10 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/080 b/tests/btrfs/080 index 3330a935..d4dea6d6 100755 --- a/tests/btrfs/080 +++ b/tests/btrfs/080 @@ -37,7 +37,7 @@ create_snapshot() { local ts=`date +'%H_%M_%S_%N'` - _run_btrfs_util_prog subvolume snapshot -r \ + _btrfs subvolume snapshot -r \ $SCRATCH_MNT $SCRATCH_MNT/"${ts}_snap" } diff --git a/tests/btrfs/083 b/tests/btrfs/083 index df3a4437..ae8cf9d4 100755 --- a/tests/btrfs/083 +++ b/tests/btrfs/083 @@ -61,7 +61,7 @@ mkdir $SCRATCH_MNT/f # | # |---- f/ (ino 264) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # Now make inode 257 a child of inode 259 and rename inode 258 to the name that # inode 257 had before. When the incremental send processes inode 257, it can't @@ -105,14 +105,14 @@ mv $SCRATCH_MNT/d $SCRATCH_MNT/e # | |----- e2/ (ino 262) # |---- file2 (ino 263) -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 # Now recreate the filesystem by receiving both send streams and verify we get @@ -121,10 +121,10 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/084 b/tests/btrfs/084 index 0e618f2e..98c9af5f 100755 --- a/tests/btrfs/084 +++ b/tests/btrfs/084 @@ -53,7 +53,7 @@ mkdir -p $SCRATCH_MNT/data/p1/p2 # |---- p1/ (ino 263) # |---- p2/ (ino 264) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # Now move directories around such that for the subtrees with the path "p1/p2" # we end up swapping the parents, that is, inode 263 becomes the parent of @@ -80,14 +80,14 @@ mv $SCRATCH_MNT/data/n4/p1/n2/p1 $SCRATCH_MNT/data # |---- p1/ (ino 260) # |---- p2/ (ino 264) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 # Now recreate the filesystem by receiving both send streams and verify we get @@ -96,9 +96,9 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/085 b/tests/btrfs/085 index 6726dd62..12ae7dfa 100755 --- a/tests/btrfs/085 +++ b/tests/btrfs/085 @@ -104,14 +104,14 @@ test_orphan() new_subvolume() { - _run_btrfs_util_prog subvolume create $SCRATCH_MNT/testdir + _btrfs subvolume create $SCRATCH_MNT/testdir } new_default() { new_subvolume SUB=$($BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{print $2}') - _run_btrfs_util_prog subvolume set-default $SUB $SCRATCH_MNT + _btrfs subvolume set-default $SUB $SCRATCH_MNT _unmount_flakey _mount_flakey diff --git a/tests/btrfs/087 b/tests/btrfs/087 index 129b83e7..28222e58 100755 --- a/tests/btrfs/087 +++ b/tests/btrfs/087 @@ -95,7 +95,7 @@ mv $SCRATCH_MNT/data/n1 $SCRATCH_MNT/data/n4/t5/p2/p1/p2/n2/t1/t7/p1/n1 # | # |--- t7/ (ino 264) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # The following sequence of directory renames resulted in an infinite path build # loop when attempting to build the path for inode 266. This is because the @@ -147,14 +147,14 @@ mv $SCRATCH_MNT/data/n4/t1/n2/p1/p2/p1/p2/t7 $SCRATCH_MNT/data/n4/t1/t7 # | # |--- t7/ (ino 264) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 # Now recreate the filesystem by receiving both send streams and verify we get @@ -163,9 +163,9 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/090 b/tests/btrfs/090 index d89f9338..49a4f3c0 100755 --- a/tests/btrfs/090 +++ b/tests/btrfs/090 @@ -27,7 +27,7 @@ TOTAL_DEVS=`echo $SCRATCH_DEV_POOL | wc -w` _scratch_pool_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed" -_run_btrfs_util_prog filesystem show $FIRST_POOL_DEV | \ +_btrfs filesystem show $FIRST_POOL_DEV | \ _filter_btrfs_filesystem_show $TOTAL_DEVS # success, all done diff --git a/tests/btrfs/091 b/tests/btrfs/091 index b71e803e..3b548966 100755 --- a/tests/btrfs/091 +++ b/tests/btrfs/091 @@ -28,11 +28,11 @@ run_check _scratch_mkfs "--nodesize $NODESIZE" # also disable all compression, or output will mismatch with golden output _try_scratch_mount "-o compress=no,compress-force=no" 2> /dev/null -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv1 -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv2 -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv3 +_btrfs subvolume create $SCRATCH_MNT/subv1 +_btrfs subvolume create $SCRATCH_MNT/subv2 +_btrfs subvolume create $SCRATCH_MNT/subv3 -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT _qgroup_rescan $SCRATCH_MNT $XFS_IO_PROG -f -c "pwrite 0 256K" $SCRATCH_MNT/subv1/file1 | _filter_xfs_io diff --git a/tests/btrfs/092 b/tests/btrfs/092 index c397a3c5..bcb3985a 100755 --- a/tests/btrfs/092 +++ b/tests/btrfs/092 @@ -73,7 +73,7 @@ mv $SCRATCH_MNT/data/t3 $SCRATCH_MNT/data/n4/t2/t7/t4/t5/t6/n2/t7 # |-- t7/ (ino 262) # |-- t3/ (ino 267) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # The sequence of directory rename operations below made the btrfs incremental # send implementation enter an infinite loop when building path strings. The @@ -134,14 +134,14 @@ mv $SCRATCH_MNT/data/n4/n1/t2/n2/t7 $SCRATCH_MNT/data/n4/n1/t2 # | # |-- t7/ (ino 262) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 # Now recreate the filesystem by receiving both send streams and verify we get @@ -150,9 +150,9 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/094 b/tests/btrfs/094 index cde26a2a..fe401fc0 100755 --- a/tests/btrfs/094 +++ b/tests/btrfs/094 @@ -68,7 +68,7 @@ $XFS_IO_PROG -c "pwrite -S 0xbb $((16 * $BLOCK_SIZE)) $((28 * $BLOCK_SIZE))" \ $XFS_IO_PROG -c "pwrite -S 0xcc $((45 * $BLOCK_SIZE)) $((3 * $BLOCK_SIZE))" \ -c "fsync" $SCRATCH_MNT/foo | _filter_xfs_io_blocks_modified -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # Now clone that same region of the 32 block extent into a new file, so that it # gets referenced twice and the incremental send operation below decides to @@ -77,10 +77,10 @@ touch $SCRATCH_MNT/bar $CLONER_PROG -s $((44 * $BLOCK_SIZE)) -d $((44 * $BLOCK_SIZE)) -l $BLOCK_SIZE \ $SCRATCH_MNT/foo $SCRATCH_MNT/bar -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 echo "File contents in the original filesystem:" @@ -97,8 +97,8 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT echo "File contents in the new filesystem:" echo "mysnap1/foo" diff --git a/tests/btrfs/097 b/tests/btrfs/097 index 3cd48822..f5222ff3 100755 --- a/tests/btrfs/097 +++ b/tests/btrfs/097 @@ -38,7 +38,7 @@ BLOCK_SIZE=$(_get_block_size $SCRATCH_MNT) $XFS_IO_PROG -f -c "pwrite -S 0xaa $((32 * $BLOCK_SIZE)) $((16 * $BLOCK_SIZE))" \ $SCRATCH_MNT/foo | _filter_xfs_io_blocks_modified -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # Now clone parts of the original extent into lower offsets of the file. # @@ -69,10 +69,10 @@ $CLONER_PROG -s $(((32 + 4) * $BLOCK_SIZE)) -d 0 -l $((4 * $BLOCK_SIZE)) \ $CLONER_PROG -s $(((32 + 12) * $BLOCK_SIZE)) -d $((4 * $BLOCK_SIZE)) \ -l $((4 * $BLOCK_SIZE)) $SCRATCH_MNT/foo $SCRATCH_MNT/foo -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 echo "File contents in the original filesystem:" @@ -84,8 +84,8 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT echo "File contents in the new filesystem:" od -t x1 $SCRATCH_MNT/mysnap2/foo | _filter_od diff --git a/tests/btrfs/099 b/tests/btrfs/099 index f19c301c..a7c76f35 100755 --- a/tests/btrfs/099 +++ b/tests/btrfs/099 @@ -25,8 +25,8 @@ _scratch_mkfs >> $seqres.full 2>&1 _scratch_mount _require_fs_space $SCRATCH_MNT $(($FILESIZE * 2 / 1024)) -_run_btrfs_util_prog quota enable $SCRATCH_MNT -_run_btrfs_util_prog qgroup limit $FILESIZE 0/5 $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT +_btrfs qgroup limit $FILESIZE 0/5 $SCRATCH_MNT # loop 5 times without sync to ensure reserved space leak will happen for i in `seq 1 5`; do diff --git a/tests/btrfs/100 b/tests/btrfs/100 index 53fc5489..11dcbb8d 100755 --- a/tests/btrfs/100 +++ b/tests/btrfs/100 @@ -32,7 +32,7 @@ _dmerror_init _mkfs_dev "-f -d raid1 -m raid1 $dev1 $DMERROR_DEV" _dmerror_mount -_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT +_btrfs filesystem show -m $SCRATCH_MNT $BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | _filter_btrfs_filesystem_show error_devid=`$BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT |\ @@ -46,9 +46,9 @@ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n 200 -p 8 $FSSTRESS_AVOID -x \ # now load the error into the DMERROR_DEV _dmerror_load_error_table -_run_btrfs_util_prog replace start -B $error_devid $dev2 $SCRATCH_MNT +_btrfs replace start -B $error_devid $dev2 $SCRATCH_MNT -_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT +_btrfs filesystem show -m $SCRATCH_MNT $BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | _filter_btrfs_filesystem_show echo "=== device replace completed" diff --git a/tests/btrfs/101 b/tests/btrfs/101 index fe380d73..cedff5c4 100755 --- a/tests/btrfs/101 +++ b/tests/btrfs/101 @@ -33,7 +33,7 @@ _dmerror_init _mkfs_dev -f -d raid1 -m raid1 $dev1 $dev2 $DMERROR_DEV _dmerror_mount -_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT +_btrfs filesystem show -m $SCRATCH_MNT $BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | _filter_btrfs_filesystem_show error_devid=`$BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT |\ @@ -47,9 +47,9 @@ run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n 200 -p 8 $FSSTRESS_AVOID -x \ # now load the error into the DMERROR_DEV _dmerror_load_error_table -_run_btrfs_util_prog device delete $error_devid $SCRATCH_MNT +_btrfs device delete $error_devid $SCRATCH_MNT -_run_btrfs_util_prog filesystem show -m $SCRATCH_MNT +_btrfs filesystem show -m $SCRATCH_MNT $BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | _filter_btrfs_filesystem_show echo "=== device delete completed" diff --git a/tests/btrfs/104 b/tests/btrfs/104 index d2e10c3e..2ba9ec9d 100755 --- a/tests/btrfs/104 +++ b/tests/btrfs/104 @@ -75,7 +75,7 @@ _scratch_mount # populate the default subvolume and create a snapshot ('snap1') _explode_fs_tree 1 $SCRATCH_MNT/files -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap1 +_btrfs subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap1 # create new btree nodes in this snapshot. They will become shared # with the next snapshot we create. @@ -86,12 +86,12 @@ _explode_fs_tree 1 $SCRATCH_MNT/snap1/files-snap1 # # As a result of this action, snap2 will get an implied ref to the # 128K extent created in the default subvolume. -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT/snap1 $SCRATCH_MNT/snap2 +_btrfs subvolume snapshot $SCRATCH_MNT/snap1 $SCRATCH_MNT/snap2 _explode_fs_tree 1 $SCRATCH_MNT/snap2/files-snap2 # Enable qgroups now that we have our filesystem prepared. This # will kick off a scan which we will have to wait for. -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT _qgroup_rescan $SCRATCH_MNT # Remount to clear cache, force everything to disk @@ -107,10 +107,10 @@ _scratch_cycle_mount # the root finding code in qgroup accounting due to snap1 no longer # providing a path to it. This was fixed by the first two patches # referenced above. -_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap1 +_btrfs subvolume delete $SCRATCH_MNT/snap1 # "btrfs filesystem sync" will trigger subvolume deletion -_run_btrfs_util_prog filesystem sync $SCRATCH_MNT +_btrfs filesystem sync $SCRATCH_MNT # Qgroup will be checked by fstest at _check_scratch_fs() diff --git a/tests/btrfs/105 b/tests/btrfs/105 index 988ce05c..14b19f5d 100755 --- a/tests/btrfs/105 +++ b/tests/btrfs/105 @@ -37,8 +37,8 @@ _scratch_mount mkdir -p $SCRATCH_MNT/foo $XFS_IO_PROG -f -c "pwrite -S 0xaa 0 64K" $SCRATCH_MNT/foo/bar | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/mysnap2 echo "File digest before being replaced:" md5sum $SCRATCH_MNT/mysnap1/foo/bar | _filter_scratch @@ -59,11 +59,11 @@ rm -f $SCRATCH_MNT/mysnap2/foo/bar $XFS_IO_PROG -f -c "pwrite -S 0xbb 0 96K" \ $SCRATCH_MNT/mysnap2/foo/bar | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/mysnap2 \ +_btrfs subvolume snapshot -r $SCRATCH_MNT/mysnap2 \ $SCRATCH_MNT/mysnap2_ro -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2_ro echo "File digest in the original filesystem after being replaced:" @@ -75,8 +75,8 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT echo "File digest in the new filesystem:" # Must match the digest from the new file. diff --git a/tests/btrfs/108 b/tests/btrfs/108 index 3fe06461..7d14a22d 100755 --- a/tests/btrfs/108 +++ b/tests/btrfs/108 @@ -46,13 +46,13 @@ $XFS_IO_PROG -c "pwrite -S 0xbb 50K 10K" \ -c "fpunch 70K 10k" \ $SCRATCH_MNT/foo | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap echo "File digests in the original filesystem:" md5sum $SCRATCH_MNT/snap/foo | _filter_scratch md5sum $SCRATCH_MNT/snap/bar | _filter_scratch -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/snap +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/snap # Now recreate the filesystem by receiving the send stream and verify we get # the same file contents that the original filesystem had. @@ -60,7 +60,7 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT # We expect the destination filesystem to have exactly the same file data as # the original filesystem. diff --git a/tests/btrfs/109 b/tests/btrfs/109 index 2fbfdb6c..13d3446f 100755 --- a/tests/btrfs/109 +++ b/tests/btrfs/109 @@ -56,13 +56,13 @@ $XFS_IO_PROG -c "pwrite -S 0xbb 0K 40K" \ cp --reflink=always $SCRATCH_MNT/foo $SCRATCH_MNT/bar # Create our snapshot for the send operation. -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap echo "File digests in the original filesystem:" md5sum $SCRATCH_MNT/snap/foo | _filter_scratch md5sum $SCRATCH_MNT/snap/bar | _filter_scratch -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/snap +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/snap # Now recreate the filesystem by receiving the send stream and verify we get # the same file contents that the original filesystem had. @@ -75,7 +75,7 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount "-o compress" -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT echo "File digests in the new filesystem:" # Must match the digests we got in the original filesystem. diff --git a/tests/btrfs/110 b/tests/btrfs/110 index 7c3f7228..e4f974fc 100755 --- a/tests/btrfs/110 +++ b/tests/btrfs/110 @@ -35,20 +35,20 @@ _scratch_mount $XFS_IO_PROG -f -c "pwrite -S 0xaa 0K 32K" $SCRATCH_MNT/foo | _filter_xfs_io # Create the first snapshot. -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap1 echo "File digest in the first filesystem, first snapshot:" md5sum $SCRATCH_MNT/snap1/foo | _filter_scratch # Save send stream for this snapshot. -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 # Create a new filesystem and receive the snapshot. _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT echo "File digest in the second filesystem, first snapshot:" # Must match the digest we got in the first filesystem. @@ -56,18 +56,18 @@ md5sum $SCRATCH_MNT/snap1/foo | _filter_scratch # Snapshot the first snapshot as rw, modify this new snapshot and then snapshot # it as RO to use in a send operation (send requires RO snapshots). -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT/snap1 $SCRATCH_MNT/snap2_rw +_btrfs subvolume snapshot $SCRATCH_MNT/snap1 $SCRATCH_MNT/snap2_rw $XFS_IO_PROG -c "pwrite -S 0xbb 4K 4K" \ $SCRATCH_MNT/snap2_rw/foo | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/snap2_rw \ +_btrfs subvolume snapshot -r $SCRATCH_MNT/snap2_rw \ $SCRATCH_MNT/snap2 echo "File digest in the second filesystem, second snapshot:" md5sum $SCRATCH_MNT/snap2/foo | _filter_scratch -_run_btrfs_util_prog send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ +_btrfs send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/snap2 # Create a new filesystem and receive both the first snapshot, through the first @@ -78,12 +78,12 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT # Receiving the second snapshot used to fail because the send stream used an # incorrect value for the clone sources uuid field - it used the uuid of # snapshot 1, which is different on each filesystem, instead of the received # uuid value, which is preserved across different filesystems. -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT echo "File digests in the third filesystem:" # Must match the digests we got in the previous filesystems. diff --git a/tests/btrfs/111 b/tests/btrfs/111 index e9f0d432..e5dfd227 100755 --- a/tests/btrfs/111 +++ b/tests/btrfs/111 @@ -35,13 +35,13 @@ _scratch_mount $XFS_IO_PROG -f -c "pwrite -S 0xaa 0K 32K" $SCRATCH_MNT/foo | _filter_xfs_io # Create the first snapshot. -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap1 # Modify our file and create the second snapshot, used later for an incremental # send operation. $XFS_IO_PROG -c "pwrite -S 0xbb 4K 4K" $SCRATCH_MNT/foo | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap2 echo "File digests in the first filesystem:" md5sum $SCRATCH_MNT/snap1/foo | _filter_scratch @@ -49,8 +49,8 @@ md5sum $SCRATCH_MNT/snap2/foo | _filter_scratch # Save send streams for the snapshots. For the first one we use a full send # operation and the for the second snapshot we use an incremental send. -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 +_btrfs send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/snap2 # Create a new filesystem and receive the snapshots. @@ -58,8 +58,8 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -vv -f $send_files_dir/1.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -vv -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -vv -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -vv -f $send_files_dir/2.snap $SCRATCH_MNT echo "File digests in the second filesystem:" # Must match the digests we got in the first filesystem. @@ -81,8 +81,8 @@ sync # Now create send streams for the snapshots from this new filesystem. For the # first snapshot we do a full send while for the second snapshot we do an # incremental send. -_run_btrfs_util_prog send -f $send_files_dir/1_2.snap $SCRATCH_MNT/snap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2_2.snap \ +_btrfs send -f $send_files_dir/1_2.snap $SCRATCH_MNT/snap1 +_btrfs send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2_2.snap \ $SCRATCH_MNT/snap2 # Create a new filesystem and receive the send streams we just created from the @@ -95,8 +95,8 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -vv -f $send_files_dir/1_2.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -vv -f $send_files_dir/2_2.snap $SCRATCH_MNT +_btrfs receive -vv -f $send_files_dir/1_2.snap $SCRATCH_MNT +_btrfs receive -vv -f $send_files_dir/2_2.snap $SCRATCH_MNT echo "File digests in the third filesystem:" # Must match the digests we got in the first and second filesystems. diff --git a/tests/btrfs/117 b/tests/btrfs/117 index 942e85fa..1cc824be 100755 --- a/tests/btrfs/117 +++ b/tests/btrfs/117 @@ -26,7 +26,7 @@ _scratch_mount mkdir -p $SCRATCH_MNT/a/b/c $XFS_IO_PROG -f -c "pwrite -S 0xfd 0 128K" $SCRATCH_MNT/a/b/c/x | _filter_xfs_io -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap1 # Create a bunch of small and empty files, this is just to make sure our # subvolume's btree gets more than 1 leaf, a condition necessary to trigger a @@ -44,13 +44,13 @@ $XFS_IO_PROG -c "pwrite -S 0xab 32K 16K" $SCRATCH_MNT/a/b/c/y | _filter_xfs_io # Will be used as an extra source root for clone operations for the incremental # send operation below. -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/clones_snap +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/clones_snap -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/snap2 -_run_btrfs_util_prog send -f $tmp/1.snap $SCRATCH_MNT/snap1 -_run_btrfs_util_prog send -f $tmp/clones.snap $SCRATCH_MNT/clones_snap -_run_btrfs_util_prog send -p $SCRATCH_MNT/snap1 \ +_btrfs send -f $tmp/1.snap $SCRATCH_MNT/snap1 +_btrfs send -f $tmp/clones.snap $SCRATCH_MNT/clones_snap +_btrfs send -p $SCRATCH_MNT/snap1 \ -c $SCRATCH_MNT/clones_snap -f $tmp/2.snap $SCRATCH_MNT/snap2 echo "File digests in the original filesystem:" @@ -62,9 +62,9 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $tmp/1.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -f $tmp/clones.snap $SCRATCH_MNT -_run_btrfs_util_prog receive -f $tmp/2.snap $SCRATCH_MNT +_btrfs receive -f $tmp/1.snap $SCRATCH_MNT +_btrfs receive -f $tmp/clones.snap $SCRATCH_MNT +_btrfs receive -f $tmp/2.snap $SCRATCH_MNT echo "File digests in the new filesystem:" # Should match the digests we had in the original filesystem. diff --git a/tests/btrfs/118 b/tests/btrfs/118 index 3cc2729c..0bb50b10 100755 --- a/tests/btrfs/118 +++ b/tests/btrfs/118 @@ -35,8 +35,8 @@ _mount_flakey # fsync the mount point path, crash and mount to replay the log. This should # succeed and after the filesystem is mounted the snapshot should not be visible # anymore. -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap1 -_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap1 +_btrfs subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap1 +_btrfs subvolume delete $SCRATCH_MNT/snap1 $XFS_IO_PROG -c "fsync" $SCRATCH_MNT _flakey_drop_and_remount [ -e $SCRATCH_MNT/snap1 ] && echo "Snapshot snap1 still exists after log replay" @@ -44,8 +44,8 @@ _flakey_drop_and_remount # Similar scenario as above, but this time the snapshot is created inside a # directory and not directly under the root (mount point path). mkdir $SCRATCH_MNT/testdir -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/testdir/snap2 -_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/testdir/snap2 +_btrfs subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/testdir/snap2 +_btrfs subvolume delete $SCRATCH_MNT/testdir/snap2 $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir _flakey_drop_and_remount [ -e $SCRATCH_MNT/testdir/snap2 ] && \ diff --git a/tests/btrfs/119 b/tests/btrfs/119 index 85aaf359..8e7c4789 100755 --- a/tests/btrfs/119 +++ b/tests/btrfs/119 @@ -30,7 +30,7 @@ _require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT # Create 2 directories with one file in one of them. # We use these just to trigger a transaction commit later, moving the file from @@ -51,8 +51,8 @@ $XFS_IO_PROG -f -s -c "pwrite -S 0xaa 0 8K" $SCRATCH_MNT/foobar | _filter_xfs_io # power failure happens before the dedicated kernel thread does the snapshot # deletion, the next time the filesystem is mounted it resumes the snapshot # deletion. -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap -_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap +_btrfs subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap +_btrfs subvolume delete $SCRATCH_MNT/snap # Now overwrite half of the extents we wrote before. Because we made a snapshpot # before, which isn't really deleted yet (since no transaction commit happened diff --git a/tests/btrfs/120 b/tests/btrfs/120 index 4e692c4c..18cd87d4 100755 --- a/tests/btrfs/120 +++ b/tests/btrfs/120 @@ -29,9 +29,9 @@ _require_dm_target flakey populate_testdir() { - _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT \ + _btrfs subvolume snapshot $SCRATCH_MNT \ $SCRATCH_MNT/testdir/snap - _run_btrfs_util_prog subvolume delete $SCRATCH_MNT/testdir/snap + _btrfs subvolume delete $SCRATCH_MNT/testdir/snap rmdir $SCRATCH_MNT/testdir mkdir $SCRATCH_MNT/testdir } diff --git a/tests/btrfs/121 b/tests/btrfs/121 index 649d1676..8be9a167 100755 --- a/tests/btrfs/121 +++ b/tests/btrfs/121 @@ -21,7 +21,7 @@ _require_scratch _scratch_mkfs >/dev/null _scratch_mount -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT # The qgroup '1/10' does not exist. The kernel should either gives an error # (newer kernel with invalid qgroup detection) or ignore it (older kernel with # above fix). diff --git a/tests/btrfs/122 b/tests/btrfs/122 index fc8ea5ec..04170d30 100755 --- a/tests/btrfs/122 +++ b/tests/btrfs/122 @@ -18,13 +18,13 @@ _require_btrfs_qgroup_report _scratch_mkfs >> $seqres.full _scratch_mount -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT mkdir "$SCRATCH_MNT/snaps" # First make some simple snapshots - the bug was initially reproduced like this -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/empty1" -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/empty2" +_btrfs subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/empty1" +_btrfs subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/empty2" # This forces the fs tree out past level 0, adding at least one tree # block which must be properly accounted for when we make our next @@ -35,8 +35,8 @@ for i in `seq 0 640`; do done # Snapshot twice. -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/snap1" -_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/snap2" +_btrfs subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/snap1" +_btrfs subvolume snapshot $SCRATCH_MNT "$SCRATCH_MNT/snaps/snap2" _scratch_unmount diff --git a/tests/btrfs/123 b/tests/btrfs/123 index db7b1986..282b7ce2 100755 --- a/tests/btrfs/123 +++ b/tests/btrfs/123 @@ -34,7 +34,7 @@ _pwrite_byte 0xcdcdcdcd 0 32m $SCRATCH_MNT/large | _filter_xfs_io sync # enable quota and rescan to get correct number -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT _qgroup_rescan $SCRATCH_MNT # now balance data block groups to corrupt qgroup diff --git a/tests/btrfs/124 b/tests/btrfs/124 index f1e33c8c..ba001ff8 100755 --- a/tests/btrfs/124 +++ b/tests/btrfs/124 @@ -68,7 +68,7 @@ echo "max_fs_sz=$max_fs_sz count=$count" >> $seqres.full echo "-----Initialize -----" >> $seqres.full _scratch_pool_mkfs "-mraid1 -draid1" >> $seqres.full 2>&1 _scratch_mount >> $seqres.full 2>&1 -_run_btrfs_util_prog filesystem show +_btrfs filesystem show dd if=/dev/zero of="$SCRATCH_MNT"/tf1 bs=$bs count=1 \ >>$seqres.full 2>&1 echo "unmount" >> $seqres.full @@ -88,7 +88,7 @@ echo "Write data with degraded mount" # the device used for mounting. _mount -o degraded $dev1 $SCRATCH_MNT >>$seqres.full 2>&1 -_run_btrfs_util_prog filesystem show +_btrfs filesystem show dd if=/dev/zero of="$SCRATCH_MNT"/tf2 bs=$bs count=$count \ >>$seqres.full 2>&1 checkpoint1=`md5sum $SCRATCH_MNT/tf2` @@ -100,9 +100,9 @@ echo >> $seqres.full echo "-----Mount normal-----" >> $seqres.full echo echo "Mount normal and balance" -_run_btrfs_util_prog device scan +_btrfs device scan _scratch_mount >> $seqres.full 2>&1 -_run_btrfs_util_prog filesystem show +_btrfs filesystem show echo >> $seqres.full _run_btrfs_balance_start ${SCRATCH_MNT} >>$seqres.full @@ -117,7 +117,7 @@ _scratch_unmount # un-scan the btrfs devices _btrfs_forget_or_module_reload _mount -o degraded $dev2 $SCRATCH_MNT >>$seqres.full 2>&1 -_run_btrfs_util_prog filesystem show +_btrfs filesystem show checkpoint3=`md5sum $SCRATCH_MNT/tf2` echo $checkpoint3 >> $seqres.full 2>&1 diff --git a/tests/btrfs/125 b/tests/btrfs/125 index 12ed3f9e..5d76018c 100755 --- a/tests/btrfs/125 +++ b/tests/btrfs/125 @@ -75,8 +75,8 @@ _scratch_pool_mkfs "-mraid5 -draid5" >> $seqres.full 2>&1 _scratch_mount >> $seqres.full 2>&1 dd if=/dev/zero of="$SCRATCH_MNT"/tf1 bs=$bs count=1 \ >>$seqres.full 2>&1 -_run_btrfs_util_prog filesystem show -_run_btrfs_util_prog filesystem df $SCRATCH_MNT +_btrfs filesystem show +_btrfs filesystem df $SCRATCH_MNT #-------------degraded-init------------------- echo >> $seqres.full @@ -92,8 +92,8 @@ _btrfs_forget_or_module_reload _mount -o degraded,device=$dev2 $dev1 $SCRATCH_MNT >>$seqres.full 2>&1 dd if=/dev/zero of="$SCRATCH_MNT"/tf2 bs=$bs count=$count \ >>$seqres.full 2>&1 -_run_btrfs_util_prog filesystem show -_run_btrfs_util_prog filesystem df $SCRATCH_MNT +_btrfs filesystem show +_btrfs filesystem df $SCRATCH_MNT checkpoint1=`md5sum $SCRATCH_MNT/tf2` echo $checkpoint1 >> $seqres.full 2>&1 @@ -104,14 +104,14 @@ echo echo "Mount normal and balance" _scratch_unmount -_run_btrfs_util_prog device scan +_btrfs device scan _scratch_mount >> $seqres.full 2>&1 echo >> $seqres.full _run_btrfs_balance_start $SCRATCH_MNT >> $seqres.full -_run_btrfs_util_prog filesystem show -_run_btrfs_util_prog filesystem df ${SCRATCH_MNT} +_btrfs filesystem show +_btrfs filesystem df ${SCRATCH_MNT} checkpoint2=`md5sum $SCRATCH_MNT/tf2` echo $checkpoint2 >> $seqres.full 2>&1 @@ -128,8 +128,8 @@ _btrfs_forget_or_module_reload _mount -o degraded,device=${dev2} $dev3 $SCRATCH_MNT >>$seqres.full 2>&1 -_run_btrfs_util_prog filesystem show -_run_btrfs_util_prog filesystem df $SCRATCH_MNT +_btrfs filesystem show +_btrfs filesystem df $SCRATCH_MNT checkpoint3=`md5sum $SCRATCH_MNT/tf2` echo $checkpoint3 >> $seqres.full 2>&1 diff --git a/tests/btrfs/126 b/tests/btrfs/126 index 74a507dd..637fde43 100755 --- a/tests/btrfs/126 +++ b/tests/btrfs/126 @@ -23,9 +23,9 @@ _scratch_mkfs >/dev/null # Use enospc_debug mount option to trigger restrict space info check _scratch_mount "-o enospc_debug" -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT _qgroup_rescan $SCRATCH_MNT -_run_btrfs_util_prog qgroup limit 512K 0/5 $SCRATCH_MNT +_btrfs qgroup limit 512K 0/5 $SCRATCH_MNT # The amount of written data may change due to different nodesize at mkfs time, # so redirect stdout to seqres.full. diff --git a/tests/btrfs/127 b/tests/btrfs/127 index 45a6d2d1..2bdb235b 100755 --- a/tests/btrfs/127 +++ b/tests/btrfs/127 @@ -109,7 +109,7 @@ mkdir $SCRATCH_MNT/case_4/other_dir # | # |---- other_dir/ (ino 284) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # case 1 # @@ -212,14 +212,14 @@ mv $SCRATCH_MNT/case_4/ance $SCRATCH_MNT/case_4/tmp/other_dir/wait_dir/desc # |---- desc/ (ino 282) # |---- ance/ (ino 283) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 # Now recreate the filesystem by receiving both send streams and verify we get @@ -228,9 +228,9 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/128 b/tests/btrfs/128 index e68d0319..e7a6e35b 100755 --- a/tests/btrfs/128 +++ b/tests/btrfs/128 @@ -52,7 +52,7 @@ mkdir $SCRATCH_MNT/del/y # |--- x/ (ino 261) # |--- y/ (ino 262) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # It used to be that when attempting to issue an rmdir operation for inode 259, # the kernel allocated an orphan_dir_info structure so that later after doing @@ -78,14 +78,14 @@ rmdir $SCRATCH_MNT/del # |--- c/ (ino 260) # |--- tmp/ (ino 258) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 # Now recreate the filesystem by receiving both send streams and verify we get @@ -94,9 +94,9 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/129 b/tests/btrfs/129 index 9147b9d2..64b02109 100755 --- a/tests/btrfs/129 +++ b/tests/btrfs/129 @@ -51,7 +51,7 @@ mkdir $SCRATCH_MNT/del/x # |--- tmp/ (ino 258) # |--- x/ (ino 261) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 # When inode 260 was processed, rename operations for it and for inode 258 were # issued (the rename for inode 260 must happen before the rename for inode 258). @@ -74,14 +74,14 @@ rmdir $SCRATCH_MNT/del # |--- c/ (ino 260) # |--- tmp/ (ino 258) # -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 run_check $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 run_check $FSSUM_PROG -A -f -w $send_files_dir/2.fssum \ -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/mysnap1 +_btrfs send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/mysnap2 # Now recreate the filesystem by receiving both send streams and verify we get @@ -90,9 +90,9 @@ _scratch_unmount _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1 -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT run_check $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2 echo "Silence is golden" diff --git a/tests/btrfs/130 b/tests/btrfs/130 index 52352d47..31fe7589 100755 --- a/tests/btrfs/130 +++ b/tests/btrfs/130 @@ -42,7 +42,7 @@ for i in $(seq 1 $(($nr_extents - 1))); do done # create a RO snapshot, so we can send out the snapshot -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/ro_snap +_btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/ro_snap # send out the subvolume, and it will either: # 1) OOM since memory is allocated inside a O(n^3) loop diff --git a/tests/btrfs/139 b/tests/btrfs/139 index f29324d3..6f5462af 100755 --- a/tests/btrfs/139 +++ b/tests/btrfs/139 @@ -27,10 +27,10 @@ _scratch_mount SUBVOL=$SCRATCH_MNT/subvol -_run_btrfs_util_prog subvolume create $SUBVOL -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs subvolume create $SUBVOL +_btrfs quota enable $SCRATCH_MNT _qgroup_rescan $SCRATCH_MNT -_run_btrfs_util_prog qgroup limit -e 1G $SUBVOL +_btrfs qgroup limit -e 1G $SUBVOL # Write and delete files within 1G limits, multiple times for i in $(seq 1 5); do diff --git a/tests/btrfs/153 b/tests/btrfs/153 index ecd648c2..8dd3cd97 100755 --- a/tests/btrfs/153 +++ b/tests/btrfs/153 @@ -19,9 +19,9 @@ _require_xfs_io_command "falloc" _scratch_mkfs >/dev/null _scratch_mount -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT _qgroup_rescan $SCRATCH_MNT -_run_btrfs_util_prog qgroup limit 100M 0/5 $SCRATCH_MNT +_btrfs qgroup limit 100M 0/5 $SCRATCH_MNT testfile1=$SCRATCH_MNT/testfile1 testfile2=$SCRATCH_MNT/testfile2 diff --git a/tests/btrfs/161 b/tests/btrfs/161 index 2fbbc540..57c54a88 100755 --- a/tests/btrfs/161 +++ b/tests/btrfs/161 @@ -30,7 +30,7 @@ create_seed() /dev/null echo -- golden -- od -x $SCRATCH_MNT/foobar - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _scratch_unmount $BTRFS_TUNE_PROG -S 1 $dev_seed run_check _mount $dev_seed $SCRATCH_MNT @@ -38,7 +38,7 @@ create_seed() create_sprout() { - _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT >> \ + _btrfs device add -f $dev_sprout $SCRATCH_MNT >> \ $seqres.full _scratch_unmount run_check _mount $dev_sprout $SCRATCH_MNT diff --git a/tests/btrfs/162 b/tests/btrfs/162 index 68652a35..31b794d9 100755 --- a/tests/btrfs/162 +++ b/tests/btrfs/162 @@ -33,7 +33,7 @@ create_seed() /dev/null echo -- gloden -- od -x $SCRATCH_MNT/foobar - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _scratch_unmount $BTRFS_TUNE_PROG -S 1 $dev_seed } @@ -41,7 +41,7 @@ create_seed() create_sprout_seed() { run_check _mount $dev_seed $SCRATCH_MNT - _run_btrfs_util_prog device add -f $dev_sprout_seed $SCRATCH_MNT >>\ + _btrfs device add -f $dev_sprout_seed $SCRATCH_MNT >>\ $seqres.full _scratch_unmount $BTRFS_TUNE_PROG -S 1 $dev_sprout_seed @@ -50,7 +50,7 @@ create_sprout_seed() create_next_sprout() { run_check _mount $dev_sprout_seed $SCRATCH_MNT - _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT >>\ + _btrfs device add -f $dev_sprout $SCRATCH_MNT >>\ $seqres.full _scratch_unmount run_check _mount $dev_sprout $SCRATCH_MNT diff --git a/tests/btrfs/163 b/tests/btrfs/163 index c7a29bf3..d2c192c9 100755 --- a/tests/btrfs/163 +++ b/tests/btrfs/163 @@ -46,7 +46,7 @@ create_seed() /dev/null echo -- golden -- od -x $SCRATCH_MNT/foobar - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _scratch_unmount $BTRFS_TUNE_PROG -S 1 $dev_seed run_check _mount $dev_seed $SCRATCH_MNT @@ -54,9 +54,9 @@ create_seed() add_sprout() { - _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT >>\ + _btrfs device add -f $dev_sprout $SCRATCH_MNT >>\ $seqres.full - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _mount -o remount,rw $dev_sprout $SCRATCH_MNT $XFS_IO_PROG -f -c "pwrite -S 0xcd 0 4M" $SCRATCH_MNT/foobar2 >\ /dev/null @@ -64,8 +64,8 @@ add_sprout() replace_sprout() { - _run_btrfs_util_prog replace start -fB $dev_sprout $dev_replace_tgt $SCRATCH_MNT - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs replace start -fB $dev_sprout $dev_replace_tgt $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _scratch_unmount _btrfs_forget_or_module_reload run_check _mount -o device=$dev_seed $dev_replace_tgt $SCRATCH_MNT @@ -80,7 +80,7 @@ seed_is_mountable() { _btrfs_forget_or_module_reload run_check _mount $dev_seed $SCRATCH_MNT - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _scratch_unmount } diff --git a/tests/btrfs/164 b/tests/btrfs/164 index d5e91cfa..433a321f 100755 --- a/tests/btrfs/164 +++ b/tests/btrfs/164 @@ -37,7 +37,7 @@ create_seed() /dev/null echo -- gloden -- od -x $SCRATCH_MNT/foobar - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _scratch_unmount $BTRFS_TUNE_PROG -S 1 $dev_seed run_check _mount $dev_seed $SCRATCH_MNT @@ -45,19 +45,19 @@ create_seed() add_sprout() { - _run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT >>\ + _btrfs device add -f $dev_sprout $SCRATCH_MNT >>\ $seqres.full run_check mount -o rw,remount $dev_seed $SCRATCH_MNT - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT } delete_seed() { - _run_btrfs_util_prog device delete $dev_seed $SCRATCH_MNT + _btrfs device delete $dev_seed $SCRATCH_MNT _scratch_unmount _btrfs_forget_or_module_reload run_check _mount $dev_sprout $SCRATCH_MNT - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT echo -- sprout -- od -x $SCRATCH_MNT/foobar _scratch_unmount @@ -66,7 +66,7 @@ delete_seed() seed_is_mountable() { run_check _mount $dev_seed $SCRATCH_MNT - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT + _btrfs filesystem show -m $SCRATCH_MNT _scratch_unmount } diff --git a/tests/btrfs/166 b/tests/btrfs/166 index 726db698..4c2af53b 100755 --- a/tests/btrfs/166 +++ b/tests/btrfs/166 @@ -33,7 +33,7 @@ _mount_flakey # Enable qgroups on the filesystem. This will start the qgroup rescan kernel # thread. -_run_btrfs_util_prog quota enable $SCRATCH_MNT +_btrfs quota enable $SCRATCH_MNT # Simulate a power failure, while the qgroup rescan kernel thread is running, # and then mount the filesystem to check that mounting the filesystem does not diff --git a/tests/btrfs/167 b/tests/btrfs/167 index fb087a73..57c2afad 100755 --- a/tests/btrfs/167 +++ b/tests/btrfs/167 @@ -33,7 +33,7 @@ _pwrite_byte 0xcd 0 128K $SCRATCH_MNT/nodatasum_file > /dev/null sync # Replace the device -_run_btrfs_util_prog replace start -Bf 1 $SPARE_DEV $SCRATCH_MNT +_btrfs replace start -Bf 1 $SPARE_DEV $SCRATCH_MNT # Unmount to drop all cache so next read will read from disk _scratch_unmount diff --git a/tests/btrfs/218 b/tests/btrfs/218 index 3afa95af..9578d4c2 100755 --- a/tests/btrfs/218 +++ b/tests/btrfs/218 @@ -35,7 +35,7 @@ $BTRFS_TUNE_PROG -S 1 $dev_seed # Mount the seed device and add the rw device _mount -o ro $dev_seed $SCRATCH_MNT -_run_btrfs_util_prog device add -f $dev_sprout $SCRATCH_MNT >> $seqres.full +_btrfs device add -f $dev_sprout $SCRATCH_MNT >> $seqres.full $BTRFS_UTIL_PROG device stats $SCRATCH_MNT | _filter_scratch_pool _scratch_unmount diff --git a/tests/btrfs/272 b/tests/btrfs/272 index 6b6dfc2e..4f799367 100755 --- a/tests/btrfs/272 +++ b/tests/btrfs/272 @@ -31,15 +31,15 @@ _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount # Create a file and 2000 hard links to the same inode -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/vol +_btrfs subvolume create $SCRATCH_MNT/vol touch $SCRATCH_MNT/vol/foo for i in {1..2000}; do link $SCRATCH_MNT/vol/foo $SCRATCH_MNT/vol/$i done # Create a snapshot for a full send operation -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap1 -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap1 +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 # Remove 2000 hard links and re-create the last 1000 links for i in {1..2000}; do @@ -50,8 +50,8 @@ for i in {1001..2000}; do done # Create another snapshot for an incremental send operation -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap2 -_run_btrfs_util_prog send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ +_btrfs subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap2 +_btrfs send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/snap2 $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/snap1 @@ -66,7 +66,7 @@ _scratch_mount # Add the first snapshot to the new filesystem by applying the first send # stream. -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT # The incremental receive operation below used to fail with the following # error: @@ -78,7 +78,7 @@ _run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT # operation cannot handle the duplicated paths, which are stored in # different ways, well, so it decides to issue a link operation for the # existing path. This results in the receiver to fail with the above error. -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/snap1 $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/snap2 diff --git a/tests/btrfs/273 b/tests/btrfs/273 index bdee1a97..d3ac5adb 100755 --- a/tests/btrfs/273 +++ b/tests/btrfs/273 @@ -107,14 +107,14 @@ get_meta_bgs() { } # This test case does not return the result because -# _run_btrfs_util_prog will call _fail() in the error case anyway. +# _btrfs will call _fail() in the error case anyway. stress_metadata_bgs() { local metabgs=$(get_meta_bgs) local count=0 while : ; do - _run_btrfs_util_prog subvolume snapshot ${SCRATCH_MNT} ${SCRATCH_MNT}/snap$i - _run_btrfs_util_prog filesystem sync ${SCRATCH_MNT} + _btrfs subvolume snapshot ${SCRATCH_MNT} ${SCRATCH_MNT}/snap$i + _btrfs filesystem sync ${SCRATCH_MNT} cur_metabgs=$(get_meta_bgs) if [[ "${cur_metabgs}" != "${metabgs}" ]]; then break diff --git a/tests/btrfs/278 b/tests/btrfs/278 index c5446201..a8b110bc 100755 --- a/tests/btrfs/278 +++ b/tests/btrfs/278 @@ -30,7 +30,7 @@ mkdir $send_files_dir _scratch_mkfs >>$seqres.full 2>&1 _scratch_mount -_run_btrfs_util_prog subvolume create $SCRATCH_MNT/vol +_btrfs subvolume create $SCRATCH_MNT/vol # Creating the first snapshot looks like: # @@ -52,7 +52,7 @@ mkdir $SCRATCH_MNT/vol/changed_subcase1.dir touch $SCRATCH_MNT/vol/changed_subcase1.dir/foo mkdir $SCRATCH_MNT/vol/changed_subcase2.dir touch $SCRATCH_MNT/vol/changed_subcase2.dir/foo -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap1 +_btrfs subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap1 # Delete the deleted.*, create a new file and a new directory, and then # take the second snapshot looks like: @@ -71,7 +71,7 @@ unlink $SCRATCH_MNT/vol/deleted.file rmdir $SCRATCH_MNT/vol/deleted.dir touch $SCRATCH_MNT/vol/new.file mkdir $SCRATCH_MNT/vol/new.dir -_run_btrfs_util_prog subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap2 +_btrfs subvolume snapshot -r $SCRATCH_MNT/vol $SCRATCH_MNT/snap2 # Set the snapshot "snap1" to read-write mode and turn several inodes to # orphans, so that the snapshot will look like this: @@ -138,7 +138,7 @@ rmdir $SCRATCH_MNT/snap2/new.dir $BTRFS_UTIL_PROG property set $SCRATCH_MNT/snap2 ro true # Test that a full send operation can handle orphans with no paths -_run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 +_btrfs send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 # Test that an incremental send operation can handle orphans. # @@ -180,7 +180,7 @@ _run_btrfs_util_prog send -f $send_files_dir/1.snap $SCRATCH_MNT/snap1 # the receive operation will fail with a wrong unlink on a non-empty # directory. # -_run_btrfs_util_prog send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ +_btrfs send -p $SCRATCH_MNT/snap1 -f $send_files_dir/2.snap \ $SCRATCH_MNT/snap2 $FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/snap1 @@ -205,10 +205,10 @@ _scratch_mount # Add the first snapshot to the new filesystem by applying the first send # stream. -_run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/1.snap $SCRATCH_MNT # Test the incremental send stream -_run_btrfs_util_prog receive -f $send_files_dir/2.snap $SCRATCH_MNT +_btrfs receive -f $send_files_dir/2.snap $SCRATCH_MNT $FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/snap1 $FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/snap2 diff --git a/tests/btrfs/320 b/tests/btrfs/320 index 6447b9f3..afed43b5 100755 --- a/tests/btrfs/320 +++ b/tests/btrfs/320 @@ -22,8 +22,8 @@ _require_scratch_qgroup _basic_test() { echo "=== basic test ===" >> $seqres.full - _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a - _run_btrfs_util_prog quota enable $SCRATCH_MNT/a + _btrfs subvolume create $SCRATCH_MNT/a + _btrfs quota enable $SCRATCH_MNT/a _qgroup_rescan $SCRATCH_MNT subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) $BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid >> \ @@ -31,7 +31,7 @@ _basic_test() [ $? -eq 0 ] || _fail "couldn't find our subvols quota group" run_check $FSSTRESS_PROG -d $SCRATCH_MNT/a -w -p 1 -n 2000 \ $FSSTRESS_AVOID - _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT/a \ + _btrfs subvolume snapshot $SCRATCH_MNT/a \ $SCRATCH_MNT/b # the shared values of both the original subvol and snapshot should @@ -53,8 +53,8 @@ _rescan_test() { echo "=== rescan test ===" >> $seqres.full # first with a blank subvol - _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a - _run_btrfs_util_prog quota enable $SCRATCH_MNT/a + _btrfs subvolume create $SCRATCH_MNT/a + _btrfs quota enable $SCRATCH_MNT/a subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) run_check $FSSTRESS_PROG -d $SCRATCH_MNT/a -w -p 1 -n 2000 \ $FSSTRESS_AVOID @@ -76,10 +76,10 @@ _rescan_test() _limit_test_noexceed() { echo "=== limit not exceed test ===" >> $seqres.full - _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a - _run_btrfs_util_prog quota enable $SCRATCH_MNT + _btrfs subvolume create $SCRATCH_MNT/a + _btrfs quota enable $SCRATCH_MNT subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a) - _run_btrfs_util_prog qgroup limit 5M 0/$subvolid $SCRATCH_MNT + _btrfs qgroup limit 5M 0/$subvolid $SCRATCH_MNT _ddt of=$SCRATCH_MNT/a/file bs=4M count=1 >> $seqres.full 2>&1 [ $? -eq 0 ] || _fail "should have been allowed to write" }