Index: user/pho/stress2/misc/crossmp.sh
===================================================================
--- user/pho/stress2/misc/crossmp.sh	(revision 286883)
+++ user/pho/stress2/misc/crossmp.sh	(revision 286884)
@@ -1,88 +1,86 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2008 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$
 #
 
 # Parallel mount and umount of file systems
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 mounts=15		# Number of parallel scripts
 mdstart=$mdstart	# Use md unit numbers from this point
 D=$diskimage
 
 if [ $# -eq 0 ]; then
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		[ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m
 		mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m
 		mdconfig -l | grep -q md$m &&  mdconfig -d -u $m
 
 		dede $D$m 1m 1
 		mdconfig -a -t vnode -f $D$m -u $m
 		bsdlabel -w md$m auto
 		newfs $newfs_flags md${m}$part > /dev/null 2>&1
 	done
 
 	# start the parallel tests
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		./$0 $m &
 		./$0 find &
 	done
 
-	for i in `jot $mounts`; do
-		wait; wait
-	done
+	wait
 
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		mdconfig -d -u $m
 		rm -f $D$m
 	done
 
 else
 	if [ $1 = find ]; then
 		for i in `jot 1024`; do
 			find ${mntpoint}* -type f > /dev/null 2>&1
 		done
 	else
 
 		# The test: Parallel mount and unmounts
 		for i in `jot 1024`; do
 			m=$1
 			mount /dev/md${m}${part} ${mntpoint}$m
 			while mount | grep -qw $mntpoint$m; do
 				opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f")
 				umount $opt ${mntpoint}$m > /dev/null 2>&1
 			done
 		done
 	fi
 fi
Index: user/pho/stress2/misc/crossmp3.sh
===================================================================
--- user/pho/stress2/misc/crossmp3.sh	(revision 286883)
+++ user/pho/stress2/misc/crossmp3.sh	(revision 286884)
@@ -1,105 +1,105 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2014 EMC Corp.
 # 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$
 #
 
 # Parallel mount and umount of file systems
 # "panic: Bad link elm 0xfffff8052a20cc00 prev->next != elm" seen:
 # http://people.freebsd.org/~pho/stress/log/crossmp3.txt
 # Fixed in r269853
 
 # panic: softdep_waitidle: work added after flush:
 # http://people.freebsd.org/~pho/stress/log/crossmp3-2.txt, fixed by r273967.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
+CONT=/tmp/crossmp3.continue
 N=`sysctl -n hw.ncpu`
 usermem=`sysctl -n hw.usermem`
 [ `swapinfo | wc -l` -eq 1 ] && usermem=$((usermem/100*80))
 size=$((usermem / 1024 / 1024 / N))
 
 mounts=$N		# Number of parallel scripts
 
 if [ $# -eq 0 ]; then
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
-		[ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m
+		[ ! -d ${mntpoint}$m ] &&
+		    { mkdir ${mntpoint}$m;  chmod 755 ${mntpoint}$m; }
 		mount | grep "${mntpoint}$m" | grep -q md$m && umount ${mntpoint}$m
 		mdconfig -l | grep -q md$m && mdconfig -d -u $m
 
 		mdconfig -a -t swap -s ${size}m -u $m
 		bsdlabel -w md$m auto
 		newfs $newfs_flags md${m}$part > /dev/null 2>&1
 	done
 
 	# start the parallel tests
+	touch $CONT
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		./$0 $m &
 		./$0 find &
 	done
 
-	for i in `jot $mounts`; do
-		wait; wait
-	done
+	wait
 
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		mdconfig -d -u $m
-		rm -f $D$m
 	done
 
 else
-	touch /tmp/crossmp.continue
 	if [ $1 = find ]; then
-		while [ -f /tmp/crossmp.continue ]; do
+		while [ -f $CONT ]; do
 			find ${mntpoint}* -type f > /dev/null 2>&1
 		done
 	else
 		export runRUNTIME=20s
 		# The test: Parallel mount and unmounts
 		for i in `jot 3`; do
 			m=$1
-			mount /dev/md${m}${part} ${mntpoint}$m
-			chmod 777 ${mntpoint}$m
+			mount /dev/md${m}${part} ${mntpoint}$m &&
+			   chmod 777 ${mntpoint}$m
 			export RUNDIR=${mntpoint}$m/stressX
 			export CTRLDIR=${mntpoint}$m/stressX.control
 			(cd ${mntpoint}$m && find . -delete)
 			su $testuser -c 'cd ..; ./run.sh disk.cfg' > \
 			    /dev/null 2>&1
 
 			while mount | grep -q "on ${mntpoint}$m "; do
 				opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f")
 				umount $opt ${mntpoint}$m > /dev/null 2>&1
+				[ -f $CONT ] || break 2
 			done
 		done
-		rm -f /tmp/crossmp.continue
+		rm -f $CONT
 	fi
 fi
Index: user/pho/stress2/misc/crossmp4.sh
===================================================================
--- user/pho/stress2/misc/crossmp4.sh	(revision 286883)
+++ user/pho/stress2/misc/crossmp4.sh	(revision 286884)
@@ -1,112 +1,107 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2014 EMC Corp.
 # 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$
 #
 
 # Parallel mount and umount of file systems. Nullfs version.
 
 # "panic: Lock (lockmgr) null not locked @ kern/vfs_default.c:523." seen.
 # http://people.freebsd.org/~pho/stress/log/kostik698.txt
 # Fixed by r269708.
 
 # Not fixed: https://people.freebsd.org/~pho/stress/log/kostik798.txt
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 N=`sysctl -n hw.ncpu`
 usermem=`sysctl -n hw.usermem`
 [ `swapinfo | wc -l` -eq 1 ] && usermem=$((usermem/100*80))
 size=$((usermem / 1024 / 1024 / N))
 
 mounts=$N		# Number of parallel scripts
 
 if [ $# -eq 0 ]; then
 	mount | grep "$mntpoint" | grep -q md && umount ${mntpoint}
 	mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 	mdconfig -a -t swap -s ${size}m -u $mdstart
 	bsdlabel -w md$mdstart auto
 	newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1
 	mount /dev/md${mdstart}$part $mntpoint
 
 	# start the parallel tests
 	for i in `jot $mounts`; do
 		m=$(( i + mdstart - 1 ))
 		./$0 $m &
 		./$0 find &
 	done
 
-	for i in `jot $mounts`; do
-		wait; wait
-	done
+	wait
 
-	for i in `jot $mounts`; do
-		rm -f $D$m
-	done
 	while mount | grep -q "on $mntpoint "; do
 		umount $mntpoint > /dev/null 2>&1 || sleep 1
 	done
 	mdconfig -d -u $mdstart
 
 else
 	touch /tmp/crossmp.continue
 	if [ $1 = find ]; then
 		while [ -f /tmp/crossmp.continue ]; do
 			find ${mntpoint}* -type f > /dev/null 2>&1
 		done
 	else
 		m=$1
 		set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'`
 		export KBLOCKS=$(($1 / N))
 		export INODES=$(($2 / N))
 		export runRUNTIME=1m
 		export INCARNATIONS=4
 		# The test: Parallel mount and unmounts
 		for i in `jot 4`; do
 			[ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m
 			mount -t nullfs $mntpoint ${mntpoint}$m
 			mkdir -p ${mntpoint}$m/$m
 			chmod 777 ${mntpoint}$m/$m
 			export RUNDIR=${mntpoint}$m/$m/stressX
 			export CTRLDIR=${mntpoint}$m/$m/stressX.control
 			(cd  ${mntpoint}$m/$m && find . -delete)
 			su $testuser -c 'cd ..; ./run.sh disk.cfg' > \
 			    /dev/null 2>&1 &
 			sleep 30
 
 			while mount | grep -q "on ${mntpoint}$m "; do
 				opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f")
 				umount $opt ${mntpoint}$m > /dev/null 2>&1
 			done
 			wait
 		done
 		rm -f /tmp/crossmp.continue
 	fi
 fi