Index: user/pho/stress2/misc/suj29.sh
===================================================================
--- user/pho/stress2/misc/suj29.sh	(revision 297371)
+++ user/pho/stress2/misc/suj29.sh	(revision 297372)
@@ -1,71 +1,75 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2012 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 # tunefs -j enable -S xxx regression test
 # causes "Sparse journal inode 4."
 
+# Deadlocks seen:
+# https://people.freebsd.org/~pho/stress/log/jeff116.txt
+# https://people.freebsd.org/~pho/stress/log/jeff117.txt
+
 . ../default.cfg
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t swap -s 2g -u $mdstart || exit 1
 bsdlabel -w md$mdstart auto
 
 newfs -U md${mdstart}$part > /dev/null
 echo "tunefs -j enable -S 10000000 /dev/md${mdstart}$part"
 tunefs -j enable -S 10000000 /dev/md${mdstart}$part
 
 mount /dev/md${mdstart}$part $mntpoint
 chmod 777 $mntpoint
 
 export runRUNTIME=5m
 export RUNDIR=$mntpoint/stressX
 
 export LOAD=80
 export rwLOAD=80
 export TESTPROGS="
 testcases/creat/creat
 testcases/rw/rw
 testcases/swap/swap
 testcases/mkdir/mkdir
 "
 
 su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS'
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 checkfs /dev/md${mdstart}$part
 tunefs -j disable /dev/md${mdstart}$part
 checkfs /dev/md${mdstart}$part
 mdconfig -d -u $mdstart
Index: user/pho/stress2/misc/suj33.sh
===================================================================
--- user/pho/stress2/misc/suj33.sh	(revision 297371)
+++ user/pho/stress2/misc/suj33.sh	(revision 297372)
@@ -1,59 +1,60 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2013 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # Test "umount" of active file system
 # Triggers "fsync: giving up on dirty" with ease.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t swap -s 1g -u $mdstart
 bsdlabel -w md$mdstart auto
 newfs -j md${mdstart}$part  > /dev/null
 mount /dev/md${mdstart}$part $mntpoint
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=3m            # Run tests for three minutes
 chmod 777 $mntpoint
 
 su $testuser -c '(cd ..; ./run.sh disk.cfg)' > /dev/null 2>&1 &
 sleep 20
 umount $mntpoint
-killall -u $testuser
+kill $!
+../tools/killall.sh
 wait
 
 while mount | grep -q "$mntpoint "; do
 	umount $mntpoint || sleep 1
 done
 checkfs /dev/md${mdstart}$part
 mdconfig -d -u $mdstart
Index: user/pho/stress2/misc/suj7.sh
===================================================================
--- user/pho/stress2/misc/suj7.sh	(revision 297371)
+++ user/pho/stress2/misc/suj7.sh	(revision 297372)
@@ -1,56 +1,62 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2010 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD: projects/stress2/misc/suj.sh 210724 2010-08-01 10:33:03Z pho $
 #
 
 # umount stuck in mntref. Fixed in r216099
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 mdconfig -a -t swap -s 1g -u $mdstart
 bsdlabel -w md$mdstart auto
 newfs -j md${mdstart}$part > /dev/null
 mount /dev/md${mdstart}$part $mntpoint
 
 chflags 0 $mntpoint/.sujournal
 rm -f $mntpoint/.sujournal
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint > /dev/null 2>&1 || sleep 1
 done
 
-mount /dev/md${mdstart}$part $mntpoint
+# Expect console output:
+# Failed to find journal.  Use tunefs to create one
+# Failed to start journal: 2
+
+echo "Expect: \"mount: /dev/md5a: No such file or directory\""
+[ -c /dev/md${mdstart}$part ] &&
+   mount /dev/md${mdstart}$part $mntpoint
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint > /dev/null 2>&1 || sleep 1
 done
 mdconfig -d -u $mdstart