Index: user/pho/stress2/misc/mmap24.sh
===================================================================
--- user/pho/stress2/misc/mmap24.sh	(revision 307629)
+++ user/pho/stress2/misc/mmap24.sh	(revision 307630)
@@ -1,100 +1,101 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2015 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$
 #
 
 # "panic: vm_page_unwire: page 0xc36cafbc's wire count is zero" seen.
 # https://people.freebsd.org/~pho/stress/log/mmap24.txt
 # Test scenario by trasz@.
 # Fixed by r285878.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 dir=/tmp
 odir=`pwd`
 cd $dir
 sed '1,/^EOF/d' < $odir/$0 > $dir/mmap24.c
 mycc -o mmap24 -Wall -Wextra mmap24.c || exit 1
 rm -f mmap24.c
 cd $odir
 
 [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart
 mdconfig -a -t swap -s 1g -u $mdstart || exit 1
 bsdlabel -w md$mdstart auto
 newfs $newfs_flags md${mdstart}$part > /dev/null
 mount /dev/md${mdstart}$part $mntpoint
 chmod 777 $mntpoint
 
 cp /tmp/mmap24 $mntpoint
 (cd $mntpoint; ./mmap24) &
 sleep .2
 umount -f $mntpoint
 
 kill $!
 wait
 
 while mount | grep "on $mntpoint " | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
+mdconfig -d -u $mdstart
 
 rm -f /tmp/mmap24
 exit
 
 EOF
 #include <sys/fcntl.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <err.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <sys/mman.h>
 #include <err.h>
 #include <stdio.h>
 #include <unistd.h>
 
 int
 main(void)
 {
         int error;
 
         error = mlockall(MCL_CURRENT | MCL_FUTURE);
         if (error != 0)
                 err(1, "mlockall");
 
         for (;;) {
                 sleep(1);
         }
 }
Index: user/pho/stress2/misc/mmap29.sh
===================================================================
--- user/pho/stress2/misc/mmap29.sh	(revision 307629)
+++ user/pho/stress2/misc/mmap29.sh	(revision 307630)
@@ -1,72 +1,73 @@
 #!/bin/sh
 
 # $FreeBSD$
 
 # Test scenario by: David Cross <dcrosstech@gmail.com>
 
 # "panic: softdep_deallocate_dependencies: dangling deps" seen.
 # https://people.freebsd.org/~pho/stress/log/mmap29.txt
 # Fixed by: r302567.
 
 . ../default.cfg
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 [ -z "`which timeout`" ] && exit 0
 mount | grep "on $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
 mount /dev/md${mdstart}$part $mntpoint
 
 mkdir /mnt/mmap29
 cd /tmp
 cat > mmap29.c <<EOFHERE
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 int
 main(int argc, char **argv)
 {
         int fd;
         unsigned char *memrange;
 
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s <file>\n", argv[0]);
 		exit(1);
 	}
         unlink(argv[1]);
         if ((fd = open(argv[1], O_RDWR | O_CREAT, DEFFILEMODE)) == -1)
 		err(1, "open(%s)", argv[1]);
         lseek(fd, 0xbfff, SEEK_SET);
         write(fd, "\0", 1);
         if ((memrange = mmap(0, 0x2b6000, PROT_READ | PROT_WRITE, MAP_SHARED |
 	    MAP_HASSEMAPHORE | MAP_NOSYNC, fd, 0)) == MAP_FAILED)
 		err(1, "mmap");
         memrange[0] = 5;
         munmap(memrange, 0x2b6000);
         close(fd);
 
         return (0);
 }
 EOFHERE
 
 cc -o mmap29 -Wall -Wextra -O0 -g mmap29.c || exit 1
 rm mmap29.c
 ./mmap29 /mnt/mmap29/mmap291
 old=`sysctl -n kern.maxvnodes`
 trap "sysctl kern.maxvnodes=$old" EXIT INT
 sysctl kern.maxvnodes=2000
 timeout 60 find / -xdev -print >/dev/null
 while mount | grep "on $mntpoint " | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
+mdconfig -d -u $mdstart
 rm mmap29
 exit 0