Index: user/pho/stress2/misc/credleak.sh
===================================================================
--- user/pho/stress2/misc/credleak.sh	(revision 306437)
+++ user/pho/stress2/misc/credleak.sh	(revision 306438)
@@ -1,162 +1,162 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2016 Dell EMC
 # 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$
 #
 
 # Demonstrate that vfs_export() leaks M_CRED when mountd(8) is started:
 # "M_CRED leaked 160".
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 pgrep -q mountd || echo "Note: mountd(8) must run for this test to fail"
 here=`pwd`
 cd /tmp
 sed '1,/^EOF/d' < $here/$0 > credleak.c
 mycc -o credleak -Wall -Wextra -O2 -g credleak.c || exit 1
 rm -f credleak.c
 
 mount | grep -q "on $mntpoint " && umount -f $mntpoint
 mount -t tmpfs tmpfs $mntpoint
 chmod 777 $mntpoint
 
 old=`vmstat -m | grep -w cred | awk '{print $2}'`
 su $testuser -c "/tmp/credleak $mntpoint" &
 
 while kill -0 $! 2>/dev/null; do
 	umount -f $mntpoint &&
 	    mount -t tmpfs tmpfs $mntpoint
 	chmod 777 $mntpoint
 	sleep .1
 done
 pkill -9 swap
 wait
 
 while pkill -9 swap; do
 	:
 done > /dev/null 2>&1
 while mount | grep $mntpoint | grep -q tmpfs; do
 	umount $mntpoint || sleep 1
 done
 [ -n "`ls $mntpoint`" ] && find $mntpoint/* -delete
 rm -f /tmp/credleak
 
 s=0
 leak=$((`vmstat -m | grep -w cred | awk '{print $2}'` - old))
 [ $leak -gt 10 ] && { echo "M_CRED leaked $leak"; s=1; }
 exit $s
 EOF
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #define LOOPS 160
 #define PARALLEL 16
 
 int nbc, nbd;
 char *dir;
 
 void
 tmkdir(void)
 {
 	int i, j;
 	char d[MAXPATHLEN + 1], name[MAXPATHLEN + 1];
 
 	setproctitle(__func__);
 
 	i = 0;
 	snprintf(name, sizeof(name), "%s/d1.%05d", dir, getpid());
 	if (mkdir(name, 0755) == -1) {
 		if (errno != ENAMETOOLONG && errno != ENOENT &&
 		    errno != EBUSY && errno != EACCES && errno != EPERM)
 			warn("mkdir(%s)", name);
 		_exit(0);
 	}
 	for (;;) {
 		snprintf(d, sizeof(d), "/%d", i++);
 		strncat(name, d, sizeof(name) - 1);
 		if (mkdir(name, 0755) == -1) {
 			if (errno != ENAMETOOLONG && errno != ENOENT &&
 			    errno != EBUSY && errno != EACCES && errno != EPERM)
 				warn("mkdir(%s)", name);
 			i--;
 			break;
 		}
 		nbc++;
 	}
 
 	while (i >= 0) {
 		snprintf(name, sizeof(name), "%s/d1.%05d", dir, getpid());
 		for (j = 0; j < i; j++) {
 			snprintf(d, sizeof(d), "/%d", j);
 			strncat(name, d, sizeof(name) - 1);
 		}
 		if (rmdir(name) == -1) {
 			if (errno != ENOTEMPTY && errno != ENOENT && errno !=
 			    EBUSY)
 				warn("rmdir(%s)", name);
 		} else
 			nbd++;
 		i--;
 	}
 #if defined(TEST)
 	if (nbc == 0)
 		fprintf(stderr, "FAIL nbc = %d, nbd = %d\n", nbc, nbd);
 #endif
 	_exit(0);
 }
 
 int
 main(int argc, char **argv)
 {
 	int i, j;
 
 	if (argc != 2)
-		errx(1, "Usage: %s <fill path to dir>", argv[0]);
+		errx(1, "Usage: %s <full path to dir>", argv[0]);
 	dir = argv[1];
 
 	for (j = 0; j < LOOPS; j++) {
 		for (i = 0; i < PARALLEL; i++) {
 			if (fork() == 0)
 				tmkdir();
 		}
 		for (i = 0; i < PARALLEL; i++)
 			wait(NULL);
 	}
 
 	return(0);
 }
Index: user/pho/stress2/misc/link.sh
===================================================================
--- user/pho/stress2/misc/link.sh	(revision 306437)
+++ user/pho/stress2/misc/link.sh	(revision 306438)
@@ -1,194 +1,194 @@
 #!/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$
 #
 
 # Deadlock seen for file systems which suspend writes on unmount, such as
 # UFS and tmpfs.
 # http://people.freebsd.org/~pho/stress/log/link.txt
 # Fixed by r272130
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 here=`pwd`
 cd /tmp
 sed '1,/^EOF/d' < $here/$0 > link.c
 mycc -o link -Wall -Wextra -O2 -g link.c || exit 1
 rm -f link.c
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 [ -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
 
 daemon sh -c "(cd $here/../testcases/swap; ./swap -t 5m -i 20 -h -l 100)" \
     > /dev/null 2>&1
 /tmp/link $mntpoint > /dev/null 2>&1 &
 
 for i in `jot 100`; do
 	umount -f $mntpoint &&
 	    mount /dev/md${mdstart}$part $mntpoint
 	sleep .1
 done
 pkill -9 link
 wait
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 mdconfig -d -u $mdstart
 
 # tmpfs
 mount -t tmpfs tmpfs $mntpoint
 
 /tmp/link $mntpoint > /dev/null 2>&1 &
 
 for i in `jot 100`; do
 	umount -f $mntpoint &&
 	    mount -t tmpfs tmpfs $mntpoint
 	sleep .1
 done
 pkill -9 link swap
 wait
 
 while pkill -9 swap; do
 	:
 done > /dev/null 2>&1
 while mount | grep $mntpoint | grep -q tmpfs; do
 	umount $mntpoint || sleep 1
 done
 rm -f /tmp/link
 exit 0
 EOF
 #include <sys/param.h>
 #include <sys/wait.h>
 
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <time.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #define PARALLEL 16
 #define RUNTIME 300
 
 time_t start;
 char *dir;
 
 void
 trename(void)
 {
 	int fd;
 	char name1[MAXPATHLEN + 1];
 	char name2[MAXPATHLEN + 1];
 
 	setproctitle(__func__);
 	snprintf(name1, sizeof(name1), "%s/r1.%05d", dir, getpid());
 	snprintf(name2, sizeof(name2), "%s/r2.%05d", dir, getpid());
 	if ((fd = open(name1, O_RDWR | O_CREAT, 0644)) == -1)
 		err(1, "open(%s)", name1);
 	close(fd);
 
 	while (time(NULL) - start < RUNTIME) {
 		if (rename(name1, name2) == -1) {
 			if (errno == ENOENT) {
 				if ((fd = open(name1, O_RDWR | O_CREAT, 0644)) == -1)
 					err(1, "open(%s)", name1);
 				close(fd);
 				continue;
 			} else
 				warn("link(%s, %s)", name1, name2);
 		}
 		if (rename(name2, name1) == -1)
 			warn("link(%s, %s)", name2, name1);
 	}
 	unlink(name1);
 	unlink(name2);
 	_exit(0);
 }
 
 void
 tlink(void)
 {
 	int fd;
 	char name1[MAXPATHLEN + 1];
 	char name2[MAXPATHLEN + 1];
 
 	setproctitle(__func__);
 	snprintf(name1, sizeof(name1), "%s/f1.%05d", dir, getpid());
 	snprintf(name2, sizeof(name2), "%s/f2.%05d", dir, getpid());
 	if ((fd = open(name1, O_RDWR | O_CREAT, 0644)) == -1)
 		err(1, "open(%s)", name1);
 	close(fd);
 
 	while (time(NULL) - start < RUNTIME) {
 		unlink(name2);
 		if (link(name1, name2) == -1) {
 			if (errno == ENOENT) {
 				if ((fd = open(name1, O_RDWR | O_CREAT, 0644)) == -1)
 					err(1, "open(%s)", name1);
 				close(fd);
 				continue;
 			} else
 				warn("link(%s, %s)", name1, name2);
 		}
 	}
 	unlink(name1);
 	unlink(name2);
 	_exit(0);
 }
 
 int
 main(int argc, char **argv)
 {
 	int i, type;
 
 	if (argc != 2)
-		errx(1, "Usage: %s <fill path to dir>", argv[0]);
+		errx(1, "Usage: %s <full path to dir>", argv[0]);
 	dir = argv[1];
 	type = arc4random() % 2; /* test either link() or rename() */
 
 	start = time(NULL);
 	for (i = 0; i < PARALLEL; i++) {
 		if (type == 0 && fork() == 0)
 			tlink();
 		if (type == 1 && fork() == 0)
 			trename();
 	}
 	for (i = 0; i < PARALLEL; i++)
 		wait(NULL);
 
 	return(0);
 }