X-Git-Url: https://git.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=soak;h=d5c4229ad6e79b3a5a381e31f0eff61d10955edb;hp=28a2e2e94dbec478d24a0a1e691736ded8ae934f;hb=37881397f1aa62df3c63468049c80b301b0e89eb;hpb=fa6a7868cdec070223f56fede4e4c74eeb9177ab

diff --git a/soak b/soak
index 28a2e2e9..d5c4229a 100755
--- a/soak
+++ b/soak
@@ -1,28 +1,11 @@
 #!/bin/bash
-#-----------------------------------------------------------------------
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#-----------------------------------------------------------------------
-#
-# creator
-owner=dxm@sgi.com
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 seq=soak
@@ -31,7 +14,7 @@ status=1	# failure is the default!
 _cleanup()
 {
     echo "        *** umount"
-    umount $SCRATCH_DEV >/dev/null 2>&1
+    _scratch_unmount >/dev/null 2>&1
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -87,11 +70,11 @@ _log "***     (`date`)"
 _log "    *** init"
 _log "        *** unmounting scratch device"
 
-umount $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL
+_scratch_unmount 2>&1 >>$FULL
 
 _log "        *** clean scratch device"
 
-mkfs_xfs -f $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL \
+mkfs_xfs -f $SCRATCH_DEV 2>&1 >>$FULL \
                         || _fail "            !!! failed to mkfs SCRATCH_DEV"
 
 pass=1
@@ -126,11 +109,11 @@ do
     
     _log "        *** stress"
     ltp/fsstress -d $SCRATCH_MNT/soak_test -p $proc -n $stress $FSSTRESS_AVOID 2>&1 | \
-        _fix_malloc >>$FULL
+        >>$FULL
 
     _log "        *** unmounting scratch device"
 
-    umount $SCRATCH_DEV 2>&1 | _logp \
+    _scratch_unmount 2>&1 | _logp \
                             || _fail "            !!! failed to umount"
     
     let "pass = pass + 1"