Index: user/pho/stress2/misc/gnop.sh
===================================================================
--- user/pho/stress2/misc/gnop.sh	(revision 317491)
+++ user/pho/stress2/misc/gnop.sh	(revision 317492)
@@ -1,71 +1,71 @@
 #!/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$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 # Test with different sector size using gnop(8).
 # Out of VM seen:
 # https://people.freebsd.org/~pho/stress/log/gnop.txt
 
 test() {
 	. ../default.cfg
 
 	mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 	[ -c /dev/md$mdstart ] &&  mdconfig -d -u $mdstart
 
 	mdconfig -a -t swap -s 2g -u $mdstart || exit 1
 	gnop create -S $1 /dev/md$mdstart
 	newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null
 	mount /dev/md${mdstart}.nop $mntpoint
 	chmod 777 $mntpoint
 
 	export runRUNTIME=4m
 	export RUNDIR=$mntpoint/stressX
 
 	su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1
 
 	while mount | grep $mntpoint | grep -q /dev/md; do
 		umount $mntpoint || sleep 1
 	done
 	checkfs /dev/md${mdstart}.nop
 	gnop destroy /dev/md${mdstart}.nop
 	mdconfig -d -u $mdstart
 }
 
 kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 &&
     notloaded=1; }
-gnop status || exit
+gnop status || exit 1
 
 for i in 1k 2k 4k 8k; do
 	test $i
 done
 
 [ $notloaded ] && gnop unload
 exit 0
Index: user/pho/stress2/misc/gnop2.sh
===================================================================
--- user/pho/stress2/misc/gnop2.sh	(revision 317491)
+++ user/pho/stress2/misc/gnop2.sh	(revision 317492)
@@ -1,81 +1,81 @@
 #!/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$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 # "panic: vnode_pager_generic_getpages: sector size 8192 too large" seen
 # with an 8k sector size:
 # https://people.freebsd.org/~pho/stress/log/gnop2.txt
 # Fixed by r307626
 
 . ../default.cfg
 
 kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 &&
     notloaded=1; }
 dir=/tmp
 odir=`pwd`
 cd $dir
 sed '1,/^EOF/d' < $odir/mmap5.sh > $dir/gnop2.c
 mycc -o gnop2  -Wall -Wextra gnop2.c || exit 1
 rm -f gnop2.c
 cd $odir
 
 test() {
 	. ../default.cfg
 
 	mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 	[ -c /dev/md$mdstart ] &&  mdconfig -d -u $mdstart
 
 	mdconfig -a -t swap -s 2g -u $mdstart || exit 1
 	gnop create -S $1 /dev/md$mdstart
 	newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null
 	mount /dev/md${mdstart}.nop $mntpoint
 	chmod 777 $mntpoint
 
 	dd if=/dev/zero of=$mntpoint/file bs=1k count=333 2>&1 | \
 	    egrep -v "records|transferred"
 	/tmp/gnop2 $mntpoint/file
 
 	while mount | grep $mntpoint | grep -q /dev/md; do
 		umount $mntpoint || sleep 1
 	done
 	gnop destroy /dev/md${mdstart}.nop
 	mdconfig -d -u $mdstart
 }
 
-gnop status || exit
+gnop status || exit 1
 
 for i in 1k 2k 4k 8k; do
 	test $i
 done
 
 [ $notloaded ] && gnop unload
 rm -f /tmp/gnop2
 exit 0
Index: user/pho/stress2/misc/gnop3.sh
===================================================================
--- user/pho/stress2/misc/gnop3.sh	(revision 317491)
+++ user/pho/stress2/misc/gnop3.sh	(revision 317492)
@@ -1,69 +1,69 @@
 #!/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$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 # A 8k sector size test.
 # "panic: run 8 0xfffff80ff3d1e040 invalid" seen during fix development.
 
 . ../default.cfg
 
 [ $((`sysctl -n vm.swap_total` / 1024 / 1024 / 1024)) -lt 9 ] && exit 0
 
 kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 &&
     notloaded=1; }
-gnop status || exit
+gnop status || exit 1
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 [ -c /dev/md$mdstart ] &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t swap -s 8g -u $mdstart || exit 1
 gnop create -S 8k /dev/md$mdstart
 newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null
 mount /dev/md${mdstart}.nop $mntpoint
 chmod 777 $mntpoint
 
 cp -a ../../stress2 $mntpoint
 here=`pwd`
 cd $mntpoint/stress2/misc
 
 export runRUNTIME=20m
 export RUNDIR=$mntpoint/stressX
 
 su $testuser -c 'cd ..; ./run.sh marcus.cfg'
 
 cd $here
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 gnop destroy /dev/md${mdstart}.nop
 mdconfig -d -u $mdstart
 [ $notloaded ] && gnop unload
 exit 0
Index: user/pho/stress2/misc/gnop4.sh
===================================================================
--- user/pho/stress2/misc/gnop4.sh	(revision 317491)
+++ user/pho/stress2/misc/gnop4.sh	(revision 317492)
@@ -1,75 +1,75 @@
 #!/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$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 # A 8k sector size test using buildworld.
 
 . ../default.cfg
 
 gigs=9
 [ $((`sysctl -n vm.swap_total` / 1024 / 1024 / 1024)) -lt $gigs ] && exit 0
 [ -d /usr/src/sys ] || exit 0
 
 kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 &&
     notloaded=1; }
-gnop status || exit
+gnop status || exit 1
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 [ -c /dev/md$mdstart ] &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t swap -s ${gigs}g -u $mdstart || exit 1
 gnop create -S 8k /dev/md$mdstart
 newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null
 mount /dev/md${mdstart}.nop $mntpoint
 chmod 777 $mntpoint
 
 start=`date '+%s'`
 (cd /usr; tar --exclude compile -cf - src) | (cd $mntpoint; tar xf -)
 
 cd $mntpoint/src
 export MAKEOBJDIRPREFIX=$mntpoint/obj
 
 p=$((`sysctl -n hw.ncpu`+ 1))
 make -i -j $p buildworld  DESTDIR=$mntpoint TARGET=amd64 TARGET_ARCH=amd64 \
     > /dev/null &
 e=$((`date '+%s'` - start))
 sleep $((15 *  60 - e))
 kill $!
 wait
 
 cd /
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 gnop destroy /dev/md${mdstart}.nop
 mdconfig -d -u $mdstart
 [ $notloaded ] && gnop unload
 exit 0
Index: user/pho/stress2/misc/graid1_5.sh
===================================================================
--- user/pho/stress2/misc/graid1_5.sh	(revision 317491)
+++ user/pho/stress2/misc/graid1_5.sh	(revision 317492)
@@ -1,111 +1,111 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2017 Dell EMC Isilon
 # 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$
 #
 
 # Mirror tests with gnop(8) errors introduced in 2 out of three partitions.
 
 # No problems seen.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 gmirror load > /dev/null 2>&1 && unload=1
 [ -c /dev/mirror/test ] && { gmirror stop test; gmirror destroy test; }
 old=`sysctl -n kern.geom.mirror.debug`
 sysctl kern.geom.mirror.debug=-1 | grep -q -- -1 ||
 	sysctl kern.geom.mirror.debug=$old > /dev/null
 kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0; }
-gnop status || exit 0
+gnop status || exit 1
 
 u1=$mdstart
 u2=$((mdstart + 1))
 u3=$((mdstart + 2))
 s=0
 for u in $u1 $u2 $u3; do
 	[ -c /dev/md$u ] && mdconfig -d -u $u
 	mdconfig -a -t swap -s 341m -u $u
 	gpart create -s GPT md$u
 done > /dev/null
 
 set -e
 (
 gpart add -t freebsd-ufs -s 340m md$u1
 gpart add -t freebsd-ufs -s 340m md$u2
 gpart add -t freebsd-ufs -s 340m md$u3
 ) > /dev/null
 gnop create md$u2
 gnop create md$u3
 gmirror label test md${u1}p1 md${u2}.nopp1 md${u3}.nopp1
 [ -c /dev/mirror/test ] || exit 1
 
 newfs /dev/mirror/test > /dev/null
 mount /dev/mirror/test $mntpoint
 set +e
 chmod 777 $mntpoint
 
 export runRUNTIME=5m
 export RUNDIR=$mntpoint/stressX
 rm -rf /tmp/stressX.control
 
 su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 &
 pid=$!
 
 gnop configure -r 0 -w 1 md${u2}.nop
 gnop configure -r 0 -w 1 md${u3}.nop
 while kill -0 $pid > /dev/null 2>&1; do
 	if ! gmirror status test | grep -q md${u2}.nopp1; then
 		gmirror forget test
 		gmirror remove test md${u2}.nopp1 2>/dev/null
 		gmirror insert test md${u2}.nopp1 2>/dev/null
 	fi
 	if ! gmirror status test | grep -q md${u3}.nopp1; then
 		gmirror forget test
 		gmirror remove test md${u3}.nopp1 2>/dev/null
 		gmirror insert test md${u3}.nopp1 2>/dev/null
 	fi
 	sleep 1
 done
 wait
 
 while mount | grep $mntpoint | grep -q /mirror/; do
 	umount $mntpoint || sleep 5
 done
 while gmirror status test | grep -q SYNCHRONIZING; do sleep 10; done
 for i in `jot 10`; do
 	gmirror stop test && break || sleep 30
 done
 [ $i -eq 10 ] && s=1
 gmirror destroy test 2>/dev/null
 [ $unload ] && gmirror unload
 
 for u in $u1 $u2 $u3; do
 	mdconfig -d -u $u || s=3
 done
 exit $s
Index: user/pho/stress2/misc/graid1_7.sh
===================================================================
--- user/pho/stress2/misc/graid1_7.sh	(revision 317491)
+++ user/pho/stress2/misc/graid1_7.sh	(revision 317492)
@@ -1,110 +1,110 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2017 Dell EMC Isilon
 # 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$
 #
 
 # Component looses it's name:
 # g_dev_taste: make_dev_p() failed
 # (gp->name=gptid/7c598e03-19cb-11e7-b62b-001e6756c168, error=17)
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 gmirror load > /dev/null 2>&1 && unload=1
 [ -c /dev/mirror/test ] && { gmirror stop test; gmirror destroy test; }
 old=`sysctl -n kern.geom.mirror.debug`
 sysctl kern.geom.mirror.debug=-1 | grep -q -- -1 ||
     sysctl kern.geom.mirror.debug=$old > /dev/null
 kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0; }
-gnop status || exit 0
+gnop status || exit 1
 
 u1=$mdstart
 s=0
 [ -c /dev/md$u1 ] && mdconfig -d -u $u1
 mdconfig -a -t swap -s 1g -u $u1
 
 set -e
 (
 gpart create -s GPT md$u1
 gpart add -t freebsd-ufs -s 341m md$u1
 gpart add -t freebsd-ufs -s 341m md$u1
 gpart add -t freebsd-ufs -s 341m md$u1
 ) > /dev/null
 gmirror label test md${u1}p1 md${u1}p2 md${u1}p3
 [ -c /dev/mirror/test ] || exit 1
 
 newfs /dev/mirror/test > /dev/null
 mount /dev/mirror/test $mntpoint
 set +e
 chmod 777 $mntpoint
 
 export runRUNTIME=5m
 export RUNDIR=$mntpoint/stressX
 rm -rf /tmp/stressX.control
 
 su $testuser -c 'cd ..; ./run.sh io.cfg' > /dev/null 2>&1 &
 pid=$!
 
 sleep 2
 cont=/tmp/graid1_7.cont
 touch $cont
 for i in `jot 8`; do
 	while [ -f $cont ]; do
 		for u in md${u1}p2 md${u1}p3; do
 			gmirror forget test
 			gmirror remove test $u
 			gmirror insert test $u
 			id=`gmirror status test | grep gptid | awk '{print $1}'`
 			if [ $i -eq 1 -a -n "$id" ]; then
 				echo "FAIL Remove component $id"
 				gmirror remove test $id
 			fi
 		done 2>/dev/null
 	done &
 done
 while kill -0 $pid 2>/dev/null; do sleep 5; done
 rm $cont
 wait
 gmirror status test | grep -qw md${u1}p2 || gmirror insert test md${u1}p2
 gmirror status test | grep -qw md${u1}p3 || gmirror insert test md${u1}p3
 while ! gmirror status test | grep -q COMPLETE; do sleep 5; done
 
 while mount | grep $mntpoint | grep -q /mirror/; do
 	umount $mntpoint || sleep 5
 done
 while gmirror status test | grep -q SYNCHRONIZING; do sleep 10; done
 for i in `jot 10`; do
 	gmirror stop test && break || sleep 30
 done
 [ $i -eq 10 ] && s=1
 gmirror destroy test 2>/dev/null
 [ $unload ] && gmirror unload
 
 mdconfig -d -u $mdstart || s=3
 exit $s
Index: user/pho/stress2/misc/suj12.sh
===================================================================
--- user/pho/stress2/misc/suj12.sh	(revision 317491)
+++ user/pho/stress2/misc/suj12.sh	(revision 317492)
@@ -1,58 +1,59 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2011 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
 
 # Test with different sector size using gnop(8).
 
 . ../default.cfg
 
+gnop load || exit 0
 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 || exit 1
-gnop load
+gnop status || exit 1
 gnop create -S 4k /dev/md$mdstart
 newfs -j /dev/md${mdstart}.nop
 mount /dev/md${mdstart}.nop $mntpoint
 chmod 777 $mntpoint
 
 export runRUNTIME=20m
 export RUNDIR=$mntpoint/stressX
 
 su $testuser -c 'cd ..; ./run.sh marcus.cfg'
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 checkfs /dev/md${mdstart}.nop
 gnop destroy /dev/md${mdstart}.nop
 gnop unload
 mdconfig -d -u $mdstart