Index: user/pho/stress2/misc/nullfs13.sh
===================================================================
--- user/pho/stress2/misc/nullfs13.sh	(revision 317550)
+++ user/pho/stress2/misc/nullfs13.sh	(revision 317551)
@@ -1,77 +1,79 @@
 #!/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$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 # kern/178238 "nullfs don't release i-nodes on unlink"
+# See also nullfs16.sh
+# Fixed by: r292961.
 
 . ../default.cfg
 
 nullfsmp=${mntpoint}2
 mount | grep -q "$nullfsmp " && umount $nullfsmp
 
 [ -d $nullfsmp ] || mkdir $nullfsmp
 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 $newfs_flags md${mdstart}$part > /dev/null
 mount /dev/md${mdstart}$part $mntpoint
 chmod 777 $mntpoint
 mount -t nullfs $mntpoint $nullfsmp
 
 (cd $nullfsmp; jot 20 | xargs touch)
 rm $nullfsmp/*
 
 (cd $nullfsmp; jot 20 | xargs touch)
 rm $mntpoint/*
 
 (cd $mntpoint; jot 20 | xargs touch)
 rm $mntpoint/*
 
 (cd $mntpoint; jot 20 | xargs touch)
 rm $nullfsmp/*
 
 ino=`df -i $nullfsmp | tail -1 | awk '{print $6}'`
 if [ $ino -ne 2 ]; then
 	echo FAIL
 	df -i $mntpoint $nullfsmp
 	echo "ls -la $mntpoint $nullfsmp"
 	ls -la $mntpoint $nullfsmp
 fi
 
 while mount | grep -q "$nullfsmp "; do
 	umount $nullfsmp || sleep 1
 done
 
 while mount | grep -q "$mntpoint "; do
 	umount $mntpoint || sleep 1
 done
 mdconfig -d -u $mdstart
Index: user/pho/stress2/misc/nullfs18.sh
===================================================================
--- user/pho/stress2/misc/nullfs18.sh	(revision 317550)
+++ user/pho/stress2/misc/nullfs18.sh	(revision 317551)
@@ -1,135 +1,135 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2016 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$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 # Demonstate nullfs(5) inode leak.
-# Fixed by 295717.
+# Fixed by r295717.
 
 . ../default.cfg
 
 N=3
 
 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 -n md${mdstart}$part > /dev/null
 
 mount /dev/md${mdstart}$part $mntpoint
 chmod 777 $mntpoint
 set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'`
 export KBLOCKS=$(($1 / N))
 export INODES=$(($2 / N))
 
 export runRUNTIME=2m
 export LOAD=80
 export symlinkLOAD=80
 export rwLOAD=80
 export TESTPROGS="
 testcases/rw/rw
 testcases/creat/creat
 testcases/mkdir/mkdir
 "
 
 for i in `jot $N 1`; do
 	eval mp$i=${mntpoint}$i
 done
 
 for i in `jot $N 1`; do
 	eval mp=\$mp$i
 	[ -d $mp ] || mkdir -p $mp
 	mount | grep $mp | grep -q nullfs && umount -f $mp
 	msrc=$mntpoint/d$i
 	mkdir -p $msrc
 	chmod 777 $msrc
 	mount -t nullfs $msrc $mp
 	chmod 777 $mp
 	export RUNDIR=$mp/stressX
 	export CTRLDIR=$mp/stressX.control
 	mkdir $RUNDIR $CTRLDIR
 	chmod 777 $RUNDIR $CTRLDIR
 	su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > \
 	    /dev/null 2>&1 &
 	mps="$mps $mp"
 done
 
 (cd ../testcases/swap; ./swap -t 10m -i 20 > /dev/null 2>&1) &
 sleep 1
 while pgrep -q run; do
 	find $mps -ls > /dev/null 2>&1
 done
 while pgrep -q swap; do
 	pkill -9 swap
 done
 wait
 
 (cd $mntpoint; find . -delete)
 sync; sleep 1; sync; sleep 1; sync
 inodes=`df -i $mntpoint | tail -1 | awk '{print $6}'`
 if [ $inodes -ne 4 ]; then
 	echo "FAIL 1"
 	e=1
 	mount | sed -n "1p;/${mntpoint#/}/p"
 	echo
 	df -ik | sed -n "1p;/${mntpoint#/}/p"
 	printf "\nfind ${mntpoint}* -ls\n"
 	find ${mntpoint}* -ls
 
 	for i in `jot $N 1`; do
 		eval mp=\$mp$i
 		echo "umount $mp"
 		mount | grep $mp | grep -q nullfs && umount $mp
 	done
 
 	echo
 	df -ik | sed -n "1p;/${mntpoint#/}/p"
 else
 	for i in `jot $N 1`; do
 		eval mp=\$mp$i
 		mount | grep $mp | grep -q nullfs && umount $mp
 	done
 	inodes=`df -i $mntpoint | tail -1 | awk '{print $6}'`
 	if [ $inodes -ne 1 ]; then
 		echo "FAIL 2"
 		e=2
 		mount | sed -n "1p;/${mntpoint#/}/p"
 		echo
 		df -ik | sed -n "1p;/${mntpoint#/}/p"
 	fi
 fi
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 mdconfig -d -u $mdstart
 exit $e
Index: user/pho/stress2/misc/nullfs5.sh
===================================================================
--- user/pho/stress2/misc/nullfs5.sh	(revision 317550)
+++ user/pho/stress2/misc/nullfs5.sh	(revision 317551)
@@ -1,77 +1,80 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2009 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$
 #
 
 # Composite test: nullfs2.sh + kinfo.sh
 
 # Kernel page fault with the following non-sleepable locks held from
 # nullfs/null_vnops.c:531
 
 # Fatal trap 12: page fault while in kernel mode
 # https://people.freebsd.org/~pho/stress/log/jeff106.txt
 
 # panic: vholdl: inactive held vnode:
 # https://people.freebsd.org/~pho/stress/log/kostik815.txt
 
+# umount busy seen:
+# https://people.freebsd.org/~pho/stress/log/kostik893.txt
+
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 # NULLFS(5) and SUJ has known issues.
 mount | grep "on `df $RUNDIR | sed  '1d;s/.* //'` " | \
     grep -q  "journaled soft-updates" &&
     { echo "Skipping test due to SUJ."; exit 0; }
 
 odir=`pwd`
 cd /tmp
 sed '1,/^EOF/d;s/60/600/' < $odir/kinfo.sh > kinfo.c
 mycc -o kinfo -Wall -g kinfo.c -lutil
 rm -f kinfo.c
 cd $odir
 
 mount | grep -q procfs || mount -t procfs procfs /proc
 
 for j in `jot 5`; do
 	/tmp/kinfo &
 done
 
 mount | grep -q $mntpoint && umount -f $mntpoint
 
 mount -t nullfs `dirname $RUNDIR` $mntpoint
 
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=10m
 (cd ..; ./run.sh marcus.cfg)
 
 umount $mntpoint 2>&1 | grep -v busy
 
 mount | grep -q $mntpoint && umount -f $mntpoint
 
 wait
 rm -f /tmp/kinfo