Index: user/pho/stress2/misc/suj18.sh
===================================================================
--- user/pho/stress2/misc/suj18.sh	(revision 305653)
+++ user/pho/stress2/misc/suj18.sh	(revision 305654)
@@ -1,60 +1,66 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2011 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$
 #
 
 # SUJ and quota test scenario.
 # "panic: check_inode_unwritten: busy inode" seen.
 
+# Deadlock seen:
+# https://people.freebsd.org/~pho/stress/log/suj18.txt
+# Fixed by r305594.
+
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 mount | grep "${mntpoint}" | grep -q md${mdstart} && 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
 export PATH_FSTAB=/tmp/fstab
 echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" > $PATH_FSTAB
 mount ${mntpoint}
 set `df -ik ${mntpoint} | tail -1 | awk '{print $4,$7}'`
 export QK=$(($1 / 10 * 8))
 export QI=$(($2 / 10 * 8))
 edquota -u -f ${mntpoint} -e ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI ${testuser}
 quotaon ${mntpoint}
 export RUNDIR=${mntpoint}/stressX
 chmod 777 ${mntpoint}
 su ${testuser} -c 'sh -c "(cd ..;runRUNTIME=20m ./run.sh disk.cfg > /dev/null 2>&1)"'
 
-while mount | grep -q ${mntpoint}; do
-	umount ${mntpoint} || sleep 1
+rm -f $PATH_FSTAB
+for i in `jot 6`; do
+	umount $mntpoint && break || sleep 10
 done
+[ $i -eq 6 ] && exit 1
 mdconfig -d -u ${mdstart}
-rm -f $PATH_FSTAB
+exit 0