Index: user/pho/stress2/misc/extattr.sh
===================================================================
--- user/pho/stress2/misc/extattr.sh	(revision 343732)
+++ user/pho/stress2/misc/extattr.sh	(revision 343733)
@@ -1,98 +1,97 @@
 #!/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$
 #
 
 # Regression test of extattr on a UFS2 FS using ACLs
 # Caused a "Duplicate free" panic.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
-[ "`sysctl -in kern.features.ufs_extattr`" != "1" ] && exit 0
 [ -z "`which setfacl`" ] && exit 0
 
 odir=`pwd`
 
 cd /tmp
 sed '1,/^EOF/d' < $odir/$0 > extattr.c
 mycc -o extattr -Wall extattr.c
 rm -f extattr.c
 cd $odir
 
 mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t swap -s 20m -u $mdstart
 bsdlabel -w md$mdstart auto
 
 newfs -O 2 md${mdstart}$part > /dev/null
 mount /dev/md${mdstart}$part $mntpoint
 
 mkdir -p $mntpoint/.attribute/system
 cd $mntpoint/.attribute/system
 
 extattrctl initattr -p . 388 posix1e.acl_access
 extattrctl initattr -p . 388 posix1e.acl_default
 cd /
 umount $mntpoint
 tunefs -a enable /dev/md${mdstart}$part
 mount /dev/md${mdstart}$part $mntpoint
 mount | grep md${mdstart}$part
 
 touch $mntpoint/acl-test
 setfacl -b $mntpoint/acl-test
 setfacl -m user:nobody:rw-,group:wheel:rw- $mntpoint/acl-test
 
 for i in `jot 5`; do
 	/tmp/extattr $mntpoint/acl-test &
 done
 for i in `jot 5`; do
 	wait
 done
 
 umount $mntpoint
 mdconfig -d -u $mdstart
 rm -f /tmp/extattr
 exit
 EOF
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <err.h>
 
 int
 main(int argc, char **argv)
 {
 	int i;
 	struct stat sb;
 
 	for (i = 0; i < 100000; i++)
 		if (lstat(argv[1], &sb) == -1)
 			err(1, "lstat(%s)", argv[1]);
 	return (0);
 }
Index: user/pho/stress2/misc/extattr2.sh
===================================================================
--- user/pho/stress2/misc/extattr2.sh	(revision 343732)
+++ user/pho/stress2/misc/extattr2.sh	(revision 343733)
@@ -1,94 +1,95 @@
 #!/bin/sh
 
 #
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
 # Copyright (c) 2018 Dell EMC Isilon
 #
 # 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$
 #
 
 # [Bug 230962] Kernel panic when writing extended attributes with soft updates
 # enabled.
 # "panic: softdep_deallocate_dependencies: dangling deps" seen:
 # https://people.freebsd.org/~pho/stress/log/kostik1121.txt
 # Fixed in r343536.
+# "panic: ffs_truncate3" seen:
+# https://people.freebsd.org/~pho/stress/log/extattr2.txt
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
-[ "`sysctl -in kern.features.ufs_extattr`" != "1" ] && exit 0
 [ -z "`which setfacl`" ] && exit 0
 
 here=`pwd`
 mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t swap -s 2g -u $mdstart
 bsdlabel -w md$mdstart auto
 
 newfs $newfs_flags md${mdstart}$part > /dev/null
 mount /dev/md${mdstart}$part $mntpoint
 
 mkdir -p $mntpoint/.attribute/system
 cd $mntpoint/.attribute/system
 
 extattrctl initattr -p . 388 posix1e.acl_access
 extattrctl initattr -p . 388 posix1e.acl_default
 cd /
 umount $mntpoint
 tunefs -a enable /dev/md${mdstart}$part
 mount /dev/md${mdstart}$part $mntpoint
 mount | grep md${mdstart}$part
 
 export runRUNTIME=10m
 export RUNDIR=$mntpoint/stressX
 if [ `jot -r 1 0 1` -eq 1 ]; then
 	set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'`
 	export KBLOCKS=$(($1 / 2))
 	export INODES=$(($2 / 2))
 fi
 
 mkdir -p $RUNDIR
 chmod 0777 $RUNDIR
 setfacl -b $RUNDIR
 setfacl -m user:$testuser:rwx,group:$testuser:rwx $RUNDIR
 su $testuser -c "cd $here/..; ./run.sh marcus.cfg" &
 
 sleep 5
 while pgrep -U$testuser -q -f run.sh; do
 	find $RUNDIR | xargs -P0 -J% setfacl -m user:$testuser:rwx,group:$testuser:rwx % > /dev/null 2>&1
 done
 wait
 
 s=0
 for i in `jot 6`; do
 	mount | grep -q "on $mntpoint " || break
 	umount $mntpoint && break || sleep 10
 	[ $i -eq 6 ] &&
 	    { echo FAIL; fstat -mf $mntpoint; exit 1; }
 done
 checkfs /dev/md${mdstart}$part || s=1
 mdconfig -d -u $mdstart || s=2
 exit $s
Index: user/pho/stress2/misc/extattr_set_fd.sh
===================================================================
--- user/pho/stress2/misc/extattr_set_fd.sh	(revision 343732)
+++ user/pho/stress2/misc/extattr_set_fd.sh	(revision 343733)
@@ -1,82 +1,81 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2012 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$
 #
 
 # "panic: kmem_malloc(2069012480): kmem_map too small" seen.
 # Fixed in r237366.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
-[ "`sysctl -in kern.features.ufs_extattr`" != "1" ] && exit 0
 [ -z "`which setfacl`" ] && exit 0
 
 here=`pwd`
 cd /tmp
 sed '1,/^EOF/d' < $here/$0 > extattr_set_fd.c
 mycc -o extattr_set_fd -Wall -Wextra -O2 extattr_set_fd.c
 rm -f extattr_set_fd.c
 
 mount | grep -q "$mntpoint" && umount $mntpoint
 mdconfig -l | grep -q $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
 
 (cd $mntpoint; /tmp/extattr_set_fd)
 
 while mount | grep -q $mntpoint; do
 	umount $mntpoint || sleep 1
 done
 mdconfig -d -u $mdstart
 rm -f /tmp/extattr_set_fd
 exit 0
 EOF
 #include <sys/types.h>
 #include <sys/extattr.h>
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
 
 char buf[4096];
 
 int
 main(void)
 {
 	int fd;
 
 	if ((fd = open("theFile", O_RDWR | O_CREAT, 0622)) == -1)
 		err(1, "open(%s)", "theFile");
 
 	(void) extattr_set_fd(fd, 1, "test", buf, 0x7b5294a6);
 
 	return (0);
 }