xfs: fix more xfs_db open-coding instances

[xfstests-dev.git] / tests / xfs / 052

diff --git a/tests/xfs/052 b/tests/xfs/052
index c2cf5961050e7e387687d9a1f333949244bd1016..56231f37d2b6c5ad76a2a2759b32f4d7d252cdf7 100755 (executable)
--- a/tests/xfs/052
+++ b/tests/xfs/052
@@ -41,7 +41,7 @@ status=1      # failure is the default!
 _cleanup()
 {
        cd /
-       umount $SCRATCH_MNT 2>/dev/null
+       _scratch_unmount 2>/dev/null
        rm -f $tmp.*
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -107,10 +107,10 @@ echo ===quota output >> $seqres.full
 cat $tmp.quota >> $seqres.full
 [ ! -s $tmp.quota ] && echo "warning: quota output file is empty"
 
-umount $SCRATCH_MNT
+_scratch_unmount
 
 # note - does (insitu) conversion from fs blocks to 1K blocks
-xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seqres.full | perl -ne '
+_scratch_xfs_db -rc "dquot -$type $id" -c p  | tee -a $seqres.full | perl -ne '
        if (/^diskdq.bcount = (\d+)$/) {
                 print "used_blocks=", $1 * '$dbsize' / 1024, "\n";
        }