From: David Sterba <dsterba@suse.com>
Date: Thu, 30 Mar 2017 15:06:33 +0000 (+0200)
Subject: btrfs: use full subcommand names
X-Git-Tag: v2022.05.01~2107
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2fd80caf7175ede6cc6d6927c857264467d1d005;p=xfstests-dev.git

btrfs: use full subcommand names

Update the remaining calls to 'btrfs' that use shortened command
names.  Use of full names is recommended to avoid any ambiguities.

Signed-off-by: David Sterba <dsterba@suse.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/tests/btrfs/027 b/tests/btrfs/027
index 46970a29..2c8b458e 100755
--- a/tests/btrfs/027
+++ b/tests/btrfs/027
@@ -78,7 +78,7 @@ run_test()
 	_scratch_mount >>$seqres.full 2>&1
 
 	local missing_dev=`echo $SCRATCH_DEV_POOL | awk '{print $2}'`
-	local missing_dev_id=`$BTRFS_UTIL_PROG fi show $SCRATCH_MNT | grep $missing_dev | awk '{print $2}'`
+	local missing_dev_id=`$BTRFS_UTIL_PROG filesystem show $SCRATCH_MNT | grep $missing_dev | awk '{print $2}'`
 
 	# get some data on the filesystem so there's something to replace
 	_ddt of="$SCRATCH_MNT"/file1 bs=1M count=1 >> $seqres.full 2>&1
diff --git a/tests/btrfs/085 b/tests/btrfs/085
index 3dbc67f5..80489972 100755
--- a/tests/btrfs/085
+++ b/tests/btrfs/085
@@ -134,14 +134,14 @@ test_orphan()
 
 new_subvolume()
 {
-	_run_btrfs_util_prog subvol create $SCRATCH_MNT/testdir
+	_run_btrfs_util_prog subvolume create $SCRATCH_MNT/testdir
 }
 
 new_default()
 {
 	new_subvolume
-	SUB=$($BTRFS_UTIL_PROG subvol list $SCRATCH_MNT |awk '{print $2}')
-	_run_btrfs_util_prog subvol set-default $SUB $SCRATCH_MNT
+	SUB=$($BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT |awk '{print $2}')
+	_run_btrfs_util_prog subvolume set-default $SUB $SCRATCH_MNT
 
 	_unmount_flakey
 	_mount_flakey