land b1_5 onto HEAD

[fs/lustre-release.git] / lustre / tests / lockorder.sh

diff --git a/lustre/tests/lockorder.sh b/lustre/tests/lockorder.sh
index 5134a2d..162df9a 100644 (file)
--- a/lustre/tests/lockorder.sh
+++ b/lustre/tests/lockorder.sh
@@ -15,9 +15,10 @@ COUNT=${COUNT:-100}
 
 cleanup() {
        [ $CR_PID ] && kill -9 $CR_PID
+       [ $ST_PID ] && kill -9 $ST_PID
 }
 
-trap cleanup 0
+trap cleanup EXIT
 
 LOCKDIR=$DIR/lockdir
 LOCKFILE=$LOCKDIR/lockfile
@@ -61,7 +62,7 @@ $CREATEMANY -l$LOCKFILE $LOCKFILE -$COUNT &
 CR_PID=$!
 
 while ! test -f ${LOCKFILE}1 ; do
-       sleep 1
+       sleep 1
 done
 
 # this will lock $DIR and ${LOCKFILE}0