diff options
Diffstat (limited to 'tools/test')
275 files changed, 799 insertions, 1018 deletions
diff --git a/tools/test/stress2/default.cfg b/tools/test/stress2/default.cfg index 43b89dc7e160..f7748b55fa04 100644 --- a/tools/test/stress2/default.cfg +++ b/tools/test/stress2/default.cfg @@ -58,7 +58,6 @@ export diskimage=${diskimage:-/tmp/diskimage} # Location of 1G disk image export mntpoint=${mntpoint:-/mnt} # Disk image mount point export testuser=${testuser:-TBD} # Name of non root test user export mdstart=${mdstart:-10} # Start of free md units -export part=${part:-a} # Partition to use on a md FS export newfs_flags=${newfs_flags:-"-U"} # Default file system flags export stress2origin=${stress2origin:-`pwd`} export stress2tools=`dirname $stress2origin`/tools diff --git a/tools/test/stress2/misc/advlock.sh b/tools/test/stress2/misc/advlock.sh index 16b67c3f3340..9e7144856310 100755 --- a/tools/test/stress2/misc/advlock.sh +++ b/tools/test/stress2/misc/advlock.sh @@ -60,9 +60,8 @@ rm -f advlock.c 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 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cp /usr/bin/true $mntpoint cd $mntpoint diff --git a/tools/test/stress2/misc/audit2.sh b/tools/test/stress2/misc/audit2.sh index 1435b13d9768..36a6339b8852 100755 --- a/tools/test/stress2/misc/audit2.sh +++ b/tools/test/stress2/misc/audit2.sh @@ -37,9 +37,8 @@ pgrep -q auditd && exit 0 || service auditd onestart 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m @@ -52,7 +51,7 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart service auditd onestop diff --git a/tools/test/stress2/misc/backingstore.sh b/tools/test/stress2/misc/backingstore.sh index b16ff852acd9..5c8a1ac83577 100755 --- a/tools/test/stress2/misc/backingstore.sh +++ b/tools/test/stress2/misc/backingstore.sh @@ -37,45 +37,43 @@ export here=`pwd` m=$mdstart -mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m +mount | grep "$mntpoint" | grep -q md$m && umount $mntpoint$m mdconfig -l | grep -q md$m && mdconfig -d -u $m dd if=/dev/zero of=$D$m bs=100m count=1 status=none || exit 1 mdconfig -a -t vnode -f $D$m -u $m -bsdlabel -w md$m auto -newfs md${m}$part > /dev/null 2>&1 -[ -d ${mntpoint}$m ] || mkdir -p ${mntpoint}$m -mount $opt /dev/md${m}$part ${mntpoint}$m +newfs md${m} > /dev/null 2>&1 +[ -d $mntpoint$m ] || mkdir -p $mntpoint$m +mount $opt /dev/md$m $mntpoint$m n=$m m=$((m + 1)) -mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m +mount | grep "$mntpoint$m" | grep -q md$m && umount $mntpoint$m mdconfig -l | grep -q md$m && mdconfig -d -u $m -truncate -s 500M ${mntpoint}$n/diskimage -mdconfig -a -t vnode -f ${mntpoint}$n/diskimage -u $m +truncate -s 500M $mntpoint$n/diskimage +mdconfig -a -t vnode -f $mntpoint$n/diskimage -u $m -bsdlabel -w md$m auto -newfs md${m}$part > /dev/null 2>&1 -[ -d ${mntpoint}$m ] || mkdir -p ${mntpoint}$m -mount $opt /dev/md${m}$part ${mntpoint}$m +newfs md${m} > /dev/null 2>&1 +[ -d $mntpoint$m ] || mkdir -p $mntpoint$m +mount $opt /dev/md$m $mntpoint$m -export RUNDIR=${mntpoint}$m/stressX +export RUNDIR=$mntpoint$m/stressX ../testcases/rw/rw -t 5m -i 200 -h -n -while mount | grep -q ${mntpoint}$m; do +while mount | grep -q $mntpoint$m; do flag=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f" || echo "") - umount $flag ${mntpoint}$m > /dev/null 2>&1 + umount $flag $mntpoint$m > /dev/null 2>&1 done mdconfig -l | grep -q md$m && mdconfig -d -u $m m=$((m - 1)) -while mount | grep -q ${mntpoint}$m; do +while mount | grep -q $mntpoint$m; do umount $([ $((`date '+%s'` % 2)) -eq 0 ] && \ - echo "-f" || echo "") ${mntpoint}$m > /dev/null 2>&1 + echo "-f" || echo "") $mntpoint$m > /dev/null 2>&1 done mdconfig -l | grep -q md$m && mdconfig -d -u $m rm -f $D diff --git a/tools/test/stress2/misc/backingstore2.sh b/tools/test/stress2/misc/backingstore2.sh index 48dc6109f719..91b8cb7acb68 100755 --- a/tools/test/stress2/misc/backingstore2.sh +++ b/tools/test/stress2/misc/backingstore2.sh @@ -40,33 +40,31 @@ export here=`pwd` m1=$mdstart m2=$((m1 + 1)) -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint$m2" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint$m1" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 -[ -d ${mntpoint}$m1 ] || mkdir -p ${mntpoint}$m1 -[ -d ${mntpoint}$m2 ] || mkdir -p ${mntpoint}$m2 +[ -d $mntpoint$m1 ] || mkdir -p $mntpoint$m1 +[ -d $mntpoint$m2 ] || mkdir -p $mntpoint$m2 dd if=/dev/zero of=$D$m bs=100m count=1 status=none || exit 1 mdconfig -a -t vnode -f $D$m1 -u $m1 -bsdlabel -w md$m1 auto -newfs md${m1}$part > /dev/null 2>&1 -mount /dev/md${m1}$part ${mntpoint}$m1 +newfs md$m1 > /dev/null 2>&1 +mount /dev/md$m1 $mntpoint$m1 -truncate -s 500M ${mntpoint}$m1/diskimage -mdconfig -a -t vnode -f ${mntpoint}$m1/diskimage -u $m2 +truncate -s 500M $mntpoint$m1/diskimage +mdconfig -a -t vnode -f $mntpoint$m1/diskimage -u $m2 -bsdlabel -w md$m2 auto -newfs md${m2}$part > /dev/null 2>&1 -mount /dev/md${m2}$part ${mntpoint}$m2 +newfs md$m2 > /dev/null 2>&1 +mount /dev/md$m2 $mntpoint$m2 # Reversed umount sequence: -umount -f /dev/md${m1}$part -umount -f /dev/md${m2}$part +umount -f /dev/md$m1 +umount -f /dev/md$m2 -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 diff --git a/tools/test/stress2/misc/backingstore3.sh b/tools/test/stress2/misc/backingstore3.sh index 2610983da92e..1cea69c46477 100755 --- a/tools/test/stress2/misc/backingstore3.sh +++ b/tools/test/stress2/misc/backingstore3.sh @@ -39,35 +39,33 @@ export here=`pwd` m1=$mdstart m2=$((m1 + 1)) -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 -[ -d ${mntpoint}$m1 ] || mkdir -p ${mntpoint}$m1 -[ -d ${mntpoint}$m2 ] || mkdir -p ${mntpoint}$m2 +[ -d $mntpoint$m1 ] || mkdir -p $mntpoint$m1 +[ -d $mntpoint$m2 ] || mkdir -p $mntpoint$m2 dd if=/dev=zero of=$D$m bs=25m count=1 status=none || exit 1 mdconfig -a -t vnode -f $D$m1 -u $m1 -bsdlabel -w md$m1 auto -newfs md${m1}$part > /dev/null 2>&1 -mount /dev/md${m1}$part ${mntpoint}$m1 +newfs md$m1 > /dev/null 2>&1 +mount /dev/md$m1 $mntpoint$m1 -truncate -s 500M ${mntpoint}$m1/diskimage -mdconfig -a -t vnode -f ${mntpoint}$m1/diskimage -u $m2 +truncate -s 500M $mntpoint$m1/diskimage +mdconfig -a -t vnode -f $mntpoint$m1/diskimage -u $m2 -bsdlabel -w md$m2 auto -newfs md${m2}$part > /dev/null 2>&1 -mount /dev/md${m2}$part ${mntpoint}$m2 +newfs md$m2 > /dev/null 2>&1 +mount /dev/md$m2 $mntpoint$m2 -dd if=/dev/zero of=${mntpoint}$m2/file bs=1m > /dev/null 2>&1 +dd if=/dev/zero of=$mntpoint$m2/file bs=1m > /dev/null 2>&1 # Reversed umount sequence: -umount -f /dev/md${m1}$part -umount -f /dev/md${m2}$part +umount -f /dev/md$m1 +umount -f /dev/md$m2 -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 diff --git a/tools/test/stress2/misc/badcode.sh b/tools/test/stress2/misc/badcode.sh index c869c3a8c13e..caa9b1b6d461 100755 --- a/tools/test/stress2/misc/badcode.sh +++ b/tools/test/stress2/misc/badcode.sh @@ -40,9 +40,8 @@ kldstat -v | grep -q pty || kldload pty # ignore any load failure mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export LOAD=80 @@ -61,5 +60,5 @@ su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' while mount | grep "on $mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part +checkfs /dev/md$mdstart mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/bench.sh b/tools/test/stress2/misc/bench.sh index 965c9a3d9b99..33b6eb653879 100755 --- a/tools/test/stress2/misc/bench.sh +++ b/tools/test/stress2/misc/bench.sh @@ -43,16 +43,15 @@ cd $odir mount | grep "on $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 log=/tmp/stress2.d/bench.sh.log [ -f $log ] && old=`tail -1 $log | awk '{print $2}'` tmp=/tmp/bench.sh.tmp s=0 for j in `jot 5`; do - newfs -n -b 4096 -f 512 -i 1024 md${mdstart}$part > \ + newfs -n -b 4096 -f 512 -i 1024 md$mdstart > \ /dev/null - mount -o async /dev/md${mdstart}$part $mntpoint + mount -o async /dev/md$mdstart $mntpoint /usr/bin/time sh -c "(cd $mntpoint; /tmp/bench)" 2>&1 | \ awk '{print $1}' [ $? -ne 0 ] && s=1 diff --git a/tools/test/stress2/misc/beneath2.sh b/tools/test/stress2/misc/beneath2.sh index a89cd8deb1e1..ad1f5c538258 100755 --- a/tools/test/stress2/misc/beneath2.sh +++ b/tools/test/stress2/misc/beneath2.sh @@ -50,9 +50,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/beneath3.sh b/tools/test/stress2/misc/beneath3.sh index 46f370899ee8..9e7493a2322c 100755 --- a/tools/test/stress2/misc/beneath3.sh +++ b/tools/test/stress2/misc/beneath3.sh @@ -48,9 +48,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/bio.sh b/tools/test/stress2/misc/bio.sh index d344fdb281c3..69bdc773b3ce 100755 --- a/tools/test/stress2/misc/bio.sh +++ b/tools/test/stress2/misc/bio.sh @@ -50,9 +50,8 @@ cd $odir mount | grep "on $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 -bsdlabel -w md$mdstart auto -newfs -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/bio) & pid1=$! diff --git a/tools/test/stress2/misc/buildworld.sh b/tools/test/stress2/misc/buildworld.sh index ef4927d8dd1b..595b387c90ae 100755 --- a/tools/test/stress2/misc/buildworld.sh +++ b/tools/test/stress2/misc/buildworld.sh @@ -45,9 +45,8 @@ mount | grep -q "on $mntpoint " && umount $mntpoint dd if=/dev/zero of=$diskimage bs=1m count=3k status=none trap "rm -f $diskimage" EXIT INT mdconfig -a -t vnode -f $diskimage -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint cd /usr/src export MAKEOBJDIRPREFIX=$mntpoint/obj diff --git a/tools/test/stress2/misc/buildworld3.sh b/tools/test/stress2/misc/buildworld3.sh index 518c16151bcd..a5dc642ce876 100755 --- a/tools/test/stress2/misc/buildworld3.sh +++ b/tools/test/stress2/misc/buildworld3.sh @@ -41,12 +41,11 @@ [ -d /usr/src/sys ] || exit 0 mount | grep -q "on $mntpoint " && umount $mntpoint mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab trap "rm -f $PATH_FSTAB" EXIT INT -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export QK=$(($1 / 2)) diff --git a/tools/test/stress2/misc/buildworld4.sh b/tools/test/stress2/misc/buildworld4.sh index fae22b9a17b9..98d4904ec4bd 100755 --- a/tools/test/stress2/misc/buildworld4.sh +++ b/tools/test/stress2/misc/buildworld4.sh @@ -38,10 +38,9 @@ rm -f $diskimage mount | grep -q "on $mntpoint " && umount $mntpoint mdconfig -a -t swap -s 5g -u $mdstart -bsdlabel -w md$mdstart auto [ "$newfs_flags" = "-U" ] && newfs_flags="-j" -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mount | grep $mntpoint cd /usr/src diff --git a/tools/test/stress2/misc/burnin.sh b/tools/test/stress2/misc/burnin.sh index 0b6c206cd69b..352cc55426e3 100755 --- a/tools/test/stress2/misc/burnin.sh +++ b/tools/test/stress2/misc/burnin.sh @@ -45,9 +45,8 @@ cd $odir 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 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint d=`date '+%Y%m%dT%H%M%S'` log=/tmp/burnin.$d.log mode=`pgrep -q cron && echo "Multi-user" || echo "Single-user"` diff --git a/tools/test/stress2/misc/cmp.sh b/tools/test/stress2/misc/cmp.sh index bd492c8493ca..91adf5ea5ab0 100755 --- a/tools/test/stress2/misc/cmp.sh +++ b/tools/test/stress2/misc/cmp.sh @@ -45,10 +45,9 @@ 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 -bsdlabel -w md$mdstart auto # Don't use SU due to bogus "out of inodes" messages. -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint daemon sh -c "(cd $here/../testcases/swap; ./swap -t 5m -i 20 -h -l 100)" \ @@ -58,7 +57,7 @@ su $testuser -c "/tmp/cmp $mntpoint" & while kill -0 $! 2>/dev/null; do umount -f $mntpoint && - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint sleep .1 done diff --git a/tools/test/stress2/misc/core2.sh b/tools/test/stress2/misc/core2.sh index 4f0e0472af95..2e8396858982 100755 --- a/tools/test/stress2/misc/core2.sh +++ b/tools/test/stress2/misc/core2.sh @@ -42,9 +42,8 @@ cd $RUNDIR mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint [ -c /dev/mn$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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint touch /tmp/continue for i in `jot 64`; do diff --git a/tools/test/stress2/misc/core3.sh b/tools/test/stress2/misc/core3.sh index 68d55468c087..5d0d0c258651 100755 --- a/tools/test/stress2/misc/core3.sh +++ b/tools/test/stress2/misc/core3.sh @@ -49,9 +49,8 @@ cd $odir mount | grep -q "on $mntpoint " && umount $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/d chmod 777 $mntpoint/d @@ -65,7 +64,7 @@ while pgrep -q core3; do done > /dev/null 2>&1 & while pgrep -q core3; do [ -d $mntpoint/d ] || - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint done > /dev/null 2>&1 wait $pid status=$? diff --git a/tools/test/stress2/misc/core4.sh b/tools/test/stress2/misc/core4.sh index e77b5176c261..0f0096e7052b 100755 --- a/tools/test/stress2/misc/core4.sh +++ b/tools/test/stress2/misc/core4.sh @@ -45,11 +45,10 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $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 +newfs $newfs_flags md$mdstart > /dev/null for i in `jot 20`; do - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "(cd $mntpoint; /tmp/core4)" & su $testuser -c "(cd $mntpoint; /tmp/core4)" & diff --git a/tools/test/stress2/misc/core5.sh b/tools/test/stress2/misc/core5.sh index 6dc6ba96b742..856b01608f2e 100755 --- a/tools/test/stress2/misc/core5.sh +++ b/tools/test/stress2/misc/core5.sh @@ -91,10 +91,9 @@ mount | grep -q "on $mntpoint " && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t malloc -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs -b 4096 -f 512 -i 2048 md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint || exit 1 +newfs -b 4096 -f 512 -i 2048 md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint || exit 1 cp /tmp/core5 $mntpoint mkdir $mntpoint/dir diff --git a/tools/test/stress2/misc/crossmp.sh b/tools/test/stress2/misc/crossmp.sh index 7d1ccbe3a469..0bd07cea2aaf 100755 --- a/tools/test/stress2/misc/crossmp.sh +++ b/tools/test/stress2/misc/crossmp.sh @@ -48,8 +48,7 @@ if [ $# -eq 0 ]; then dd if=/dev/zero of=$D$m bs=1m count=1 status=none mdconfig -a -t vnode -f $D$m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -77,7 +76,7 @@ else # The test: Parallel mount and unmounts for i in `jot 1024`; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m + mount /dev/md${m} ${mntpoint}$m while mount | grep -q "on ${mntpoint}$m "; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") diff --git a/tools/test/stress2/misc/crossmp10.sh b/tools/test/stress2/misc/crossmp10.sh index 30e64a064dac..7833aec176cb 100755 --- a/tools/test/stress2/misc/crossmp10.sh +++ b/tools/test/stress2/misc/crossmp10.sh @@ -48,8 +48,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - mke2fs -m 0 /dev/md${m}$part > /dev/null 2>&1 + mke2fs -m 0 /dev/md${m} > /dev/null 2>&1 done # start the parallel tests @@ -83,7 +82,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ]; do m=$1 - mount -t ext2fs /dev/md${m}$part ${mntpoint}$m && + mount -t ext2fs /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp11.sh b/tools/test/stress2/misc/crossmp11.sh index 8bc008f6f504..8332b1592675 100755 --- a/tools/test/stress2/misc/crossmp11.sh +++ b/tools/test/stress2/misc/crossmp11.sh @@ -64,8 +64,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -97,7 +96,7 @@ else export runRUNTIME=20s # The test: Parallel mount and unmounts for i in `jot 3`; do - mount /dev/md${m}$part ${mntpoint}$m && + mount /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp3.sh b/tools/test/stress2/misc/crossmp3.sh index 30c9f86840f1..0f7c01af5569 100755 --- a/tools/test/stress2/misc/crossmp3.sh +++ b/tools/test/stress2/misc/crossmp3.sh @@ -57,8 +57,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -89,7 +88,7 @@ else # The test: Parallel mount and unmounts for i in `jot 3`; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m && + mount /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp4.sh b/tools/test/stress2/misc/crossmp4.sh index 7f24097475f3..e22f969b72bb 100755 --- a/tools/test/stress2/misc/crossmp4.sh +++ b/tools/test/stress2/misc/crossmp4.sh @@ -52,9 +52,8 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s ${size}m -u $mdstart - bsdlabel -w md$mdstart auto - newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 - mount /dev/md${mdstart}$part $mntpoint + newfs $newfs_flags md$mdstart > /dev/null 2>&1 + mount /dev/md$mdstart $mntpoint # start the parallel tests for i in `jot $mounts`; do diff --git a/tools/test/stress2/misc/crossmp5.sh b/tools/test/stress2/misc/crossmp5.sh index 9a636c9aae45..b5a8304f2dcb 100755 --- a/tools/test/stress2/misc/crossmp5.sh +++ b/tools/test/stress2/misc/crossmp5.sh @@ -48,8 +48,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -77,7 +76,7 @@ else # The test: Parallel mount and unmount m=$1 for i in `jot 200`; do - mount /dev/md${m}$part ${mntpoint}$m + mount /dev/md${m} ${mntpoint}$m chmod 777 ${mntpoint}$m l=`jot -r 1 65535` dd if=/dev/zero of=$mntpoint/$i bs=$l count=100 \ diff --git a/tools/test/stress2/misc/crossmp8.sh b/tools/test/stress2/misc/crossmp8.sh index f8d06d6a4a30..e877dfaf6d1c 100755 --- a/tools/test/stress2/misc/crossmp8.sh +++ b/tools/test/stress2/misc/crossmp8.sh @@ -61,8 +61,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs md${m}$part > /dev/null 2>&1 + newfs md${m} > /dev/null 2>&1 done # start the parallel tests @@ -100,7 +99,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ]; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m && + mount /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp9.sh b/tools/test/stress2/misc/crossmp9.sh index e55f16b5ede4..b049f65aded9 100755 --- a/tools/test/stress2/misc/crossmp9.sh +++ b/tools/test/stress2/misc/crossmp9.sh @@ -47,8 +47,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s 512m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -78,7 +77,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ] ; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m + mount /dev/md${m} ${mntpoint}$m while mount | grep -qw ${mntpoint}$m; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") diff --git a/tools/test/stress2/misc/dangling.sh b/tools/test/stress2/misc/dangling.sh index 5f3db6db00ec..cd807a382375 100755 --- a/tools/test/stress2/misc/dangling.sh +++ b/tools/test/stress2/misc/dangling.sh @@ -42,9 +42,8 @@ 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 4g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint || exit 1 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint || exit 1 chmod 777 $mntpoint export runRUNTIME=4m diff --git a/tools/test/stress2/misc/datamove5.sh b/tools/test/stress2/misc/datamove5.sh index 5f4a868f03b1..49e97570100d 100755 --- a/tools/test/stress2/misc/datamove5.sh +++ b/tools/test/stress2/misc/datamove5.sh @@ -47,9 +47,8 @@ mount | grep -wq $mp2 && umount $mp2 mount | grep -wq $mp1 && umount $mp1 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 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mp1 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mp1 mount -t nullfs $opt $mp1 $mp2 chmod 777 $mp2 diff --git a/tools/test/stress2/misc/devfd.sh b/tools/test/stress2/misc/devfd.sh index 1f5eecece0ca..a1ff329cda1c 100755 --- a/tools/test/stress2/misc/devfd.sh +++ b/tools/test/stress2/misc/devfd.sh @@ -47,9 +47,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "(cd $mntpoint; /tmp/devfd)" diff --git a/tools/test/stress2/misc/dfull.sh b/tools/test/stress2/misc/dfull.sh index 100784047dbc..5ee40698a96d 100755 --- a/tools/test/stress2/misc/dfull.sh +++ b/tools/test/stress2/misc/dfull.sh @@ -33,13 +33,12 @@ . ../default.cfg -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t swap -s 512m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` diff --git a/tools/test/stress2/misc/dtrace.sh b/tools/test/stress2/misc/dtrace.sh index 3521ef3099e5..dc11e67edec5 100755 --- a/tools/test/stress2/misc/dtrace.sh +++ b/tools/test/stress2/misc/dtrace.sh @@ -36,9 +36,8 @@ dtrace -n 'dtrace:::BEGIN { exit(0); }' > /dev/null 2>&1 || exit 0 mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m diff --git a/tools/test/stress2/misc/execpath.sh b/tools/test/stress2/misc/execpath.sh index 4323e3b7d505..22613a948e6b 100755 --- a/tools/test/stress2/misc/execpath.sh +++ b/tools/test/stress2/misc/execpath.sh @@ -45,9 +45,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/exlock.sh b/tools/test/stress2/misc/exlock.sh index 6e88f9437177..7369f6fe3834 100755 --- a/tools/test/stress2/misc/exlock.sh +++ b/tools/test/stress2/misc/exlock.sh @@ -43,9 +43,8 @@ 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 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "cd $mntpoint; /tmp/exlock" diff --git a/tools/test/stress2/misc/ext2fs2.sh b/tools/test/stress2/misc/ext2fs2.sh index a576c582cc7e..748e45a33ffa 100755 --- a/tools/test/stress2/misc/ext2fs2.sh +++ b/tools/test/stress2/misc/ext2fs2.sh @@ -39,11 +39,12 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null mke2fs /dev/md${mdstart}a # No panic seen when disabling hashed b-tree lookup for large directories -# tune2fs -O ^dir_index /dev/md${mdstart}$part -mount -t ext2fs /dev/md${mdstart}$part $mntpoint +# tune2fs -O ^dir_index /dev/md$mdstart +mount -t ext2fs /dev/md${mdstart}a $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes diff --git a/tools/test/stress2/misc/extattr.sh b/tools/test/stress2/misc/extattr.sh index 31027eec696b..bd37c092bda8 100755 --- a/tools/test/stress2/misc/extattr.sh +++ b/tools/test/stress2/misc/extattr.sh @@ -42,14 +42,13 @@ mycc -o extattr -Wall extattr.c rm -f extattr.c cd $odir -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && 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 +newfs -O 2 md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir -p $mntpoint/.attribute/system cd $mntpoint/.attribute/system @@ -58,9 +57,9 @@ 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 +tunefs -a enable /dev/md$mdstart +mount /dev/md$mdstart $mntpoint +mount | grep md$mdstart touch $mntpoint/acl-test setfacl -b $mntpoint/acl-test diff --git a/tools/test/stress2/misc/extattr2.sh b/tools/test/stress2/misc/extattr2.sh index 313d4ea26447..3ce10dfbc894 100755 --- a/tools/test/stress2/misc/extattr2.sh +++ b/tools/test/stress2/misc/extattr2.sh @@ -41,14 +41,13 @@ [ -z "`which setfacl`" ] && exit 0 here=`pwd` -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir -p $mntpoint/.attribute/system cd $mntpoint/.attribute/system @@ -57,9 +56,9 @@ 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 +tunefs -a enable /dev/md$mdstart +mount /dev/md$mdstart $mntpoint +mount | grep md$mdstart export runRUNTIME=10m export RUNDIR=$mntpoint/stressX @@ -89,6 +88,6 @@ for i in `jot 6`; do [ $i -eq 6 ] && { echo FAIL; fstat -mf $mntpoint; exit 1; } done -checkfs /dev/md${mdstart}$part || s=1 +checkfs /dev/md$mdstart || s=1 mdconfig -d -u $mdstart || s=2 exit $s diff --git a/tools/test/stress2/misc/extattr_set_fd.sh b/tools/test/stress2/misc/extattr_set_fd.sh index 22bfa52f4813..3982318fe9e0 100755 --- a/tools/test/stress2/misc/extattr_set_fd.sh +++ b/tools/test/stress2/misc/extattr_set_fd.sh @@ -43,9 +43,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint (cd $mntpoint; /tmp/extattr_set_fd) diff --git a/tools/test/stress2/misc/extattrctl.sh b/tools/test/stress2/misc/extattrctl.sh index dad79023a2fc..14cb44ab72b4 100755 --- a/tools/test/stress2/misc/extattrctl.sh +++ b/tools/test/stress2/misc/extattrctl.sh @@ -43,14 +43,13 @@ { echo "Kernel not build with UFS_EXTATTR"; exit 0; } [ -z "`which setfacl`" ] && exit 0 -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && 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 1 md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -O 1 md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir -p $mntpoint/.attribute/system cd $mntpoint/.attribute/system @@ -59,9 +58,9 @@ 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 +tunefs -a enable /dev/md$mdstart +mount /dev/md$mdstart $mntpoint +mount | grep md$mdstart touch $mntpoint/acl-test setfacl -b $mntpoint/acl-test diff --git a/tools/test/stress2/misc/ffs_blkfree.sh b/tools/test/stress2/misc/ffs_blkfree.sh index 5ea4828429c3..a71a979857ed 100755 --- a/tools/test/stress2/misc/ffs_blkfree.sh +++ b/tools/test/stress2/misc/ffs_blkfree.sh @@ -35,14 +35,13 @@ DUMP=$RUNDIR/dump trap "rm -f $D" EXIT INT dd if=/dev/zero of=$D bs=1m count=1024 status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mount for i in `jot 10`; do @@ -52,7 +51,7 @@ for i in `jot 10`; do done done -dump -L0a -f $DUMP /dev/md${mdstart}$part +dump -L0a -f $DUMP /dev/md$mdstart ls -lf $DUMP @@ -62,8 +61,8 @@ while mount | grep -q $mntpoint; do done for i in `jot 10`; do - newfs $newfs_flags -n md${mdstart}$part > /dev/null - mount /dev/md${mdstart}$part $mntpoint + newfs $newfs_flags -n md$mdstart > /dev/null + mount /dev/md$mdstart $mntpoint (cd $mntpoint; restore -rf $DUMP) rm -rf $mntpoint/* while mount | grep -q $mntpoint; do diff --git a/tools/test/stress2/misc/ffs_sync.sh b/tools/test/stress2/misc/ffs_sync.sh index aa970839c7b3..c2f4bc962d11 100755 --- a/tools/test/stress2/misc/ffs_sync.sh +++ b/tools/test/stress2/misc/ffs_sync.sh @@ -44,9 +44,8 @@ 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 4g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint for i in `jot 3`; do diff --git a/tools/test/stress2/misc/ffs_syncvnode.sh b/tools/test/stress2/misc/ffs_syncvnode.sh index faa9856a8bca..96991ca7904c 100755 --- a/tools/test/stress2/misc/ffs_syncvnode.sh +++ b/tools/test/stress2/misc/ffs_syncvnode.sh @@ -39,11 +39,10 @@ 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 $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m diff --git a/tools/test/stress2/misc/ffs_syncvnode2.sh b/tools/test/stress2/misc/ffs_syncvnode2.sh index 5fd9e4cfe843..a3356183a15d 100755 --- a/tools/test/stress2/misc/ffs_syncvnode2.sh +++ b/tools/test/stress2/misc/ffs_syncvnode2.sh @@ -41,11 +41,10 @@ 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 $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m diff --git a/tools/test/stress2/misc/fifo.sh b/tools/test/stress2/misc/fifo.sh index 662f09d5d2dc..773ceaedd938 100755 --- a/tools/test/stress2/misc/fifo.sh +++ b/tools/test/stress2/misc/fifo.sh @@ -47,15 +47,14 @@ 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 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint (cd $mntpoint; /tmp/fifo) for i in `jot 10`; do - mount | grep -q md${mdstart}$part && \ + mount | grep -q md$mdstart && \ umount $mntpoint && mdconfig -d -u $mdstart && break sleep 10 done diff --git a/tools/test/stress2/misc/fifo2.sh b/tools/test/stress2/misc/fifo2.sh index 7d32ce063908..9e4a7e632e9d 100755 --- a/tools/test/stress2/misc/fifo2.sh +++ b/tools/test/stress2/misc/fifo2.sh @@ -45,9 +45,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mkfifo $mntpoint/f chmod 777 $mntpoint/f @@ -66,13 +65,13 @@ while [ $((`date '+%s'` - st)) -lt $((10 * sleeptime)) ]; do done for i in `jot 10`; do - mount | grep -q md${mdstart}$part && \ + mount | grep -q md$mdstart && \ umount $mntpoint > /dev/null 2>&1 && mdconfig -d -u $mdstart && break sleep 10 done s=0 -mount | grep -q md${mdstart}$part && +mount | grep -q md$mdstart && { echo "umount $mntpoint failed"; s=1; } rm -f /tmp/fifo2 exit $s diff --git a/tools/test/stress2/misc/fifo3.sh b/tools/test/stress2/misc/fifo3.sh index 04fca483eabf..4ffd34e2f424 100755 --- a/tools/test/stress2/misc/fifo3.sh +++ b/tools/test/stress2/misc/fifo3.sh @@ -188,9 +188,8 @@ 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 md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/fifo3 ) & diff --git a/tools/test/stress2/misc/flock.sh b/tools/test/stress2/misc/flock.sh index 451fec4b518a..cbb07e14085d 100755 --- a/tools/test/stress2/misc/flock.sh +++ b/tools/test/stress2/misc/flock.sh @@ -53,9 +53,8 @@ cd $odir 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 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/flock) e=$? diff --git a/tools/test/stress2/misc/flock_open_close.sh b/tools/test/stress2/misc/flock_open_close.sh index 2b70d41aa4f8..01e376319abe 100755 --- a/tools/test/stress2/misc/flock_open_close.sh +++ b/tools/test/stress2/misc/flock_open_close.sh @@ -46,9 +46,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint cp /bin/test $mntpoint @@ -67,11 +66,11 @@ wait $pid s=$? for i in `jot 10`; do - mount | grep -q md${mdstart}$part && \ + mount | grep -q md$mdstart && \ umount $mntpoint && mdconfig -d -u $mdstart && break sleep 2 done -if mount | grep -q md${mdstart}$part; then +if mount | grep -q md$mdstart; then fstat $mntpoint echo "umount $mntpoint failed" exit 1 diff --git a/tools/test/stress2/misc/forkbomb.sh b/tools/test/stress2/misc/forkbomb.sh index 9638fe796fee..73a3c5f37fe2 100755 --- a/tools/test/stress2/misc/forkbomb.sh +++ b/tools/test/stress2/misc/forkbomb.sh @@ -47,9 +47,8 @@ cd $odir 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 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint su $testuser -c /tmp/forkbomb diff --git a/tools/test/stress2/misc/fragments.sh b/tools/test/stress2/misc/fragments.sh index ea1d095081c6..56d95d9cf8d9 100755 --- a/tools/test/stress2/misc/fragments.sh +++ b/tools/test/stress2/misc/fragments.sh @@ -48,9 +48,8 @@ mount | grep "$mntpoint" | grep -q md$mdstart && 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 -m 0 md${mdstart}$part > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -m 0 md$mdstart > /dev/null 2>&1 +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint cd $mntpoint diff --git a/tools/test/stress2/misc/fs.sh b/tools/test/stress2/misc/fs.sh index dde3f39ed3ef..40cd8bd0917a 100755 --- a/tools/test/stress2/misc/fs.sh +++ b/tools/test/stress2/misc/fs.sh @@ -37,8 +37,8 @@ ftest () { # option, disk full local args="$@" [ $2 -eq 1 ] && df=", disk full" || df="" echo "`date '+%T'` newfs $1 md${mdstart}${part}$df" - newfs $1 md${mdstart}$part > /dev/null - mount /dev/md${mdstart}$part $mntpoint + newfs $1 md$mdstart > /dev/null + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX @@ -67,14 +67,13 @@ ftest () { # option, disk full umount -f $mntpoint fi done - checkfs /dev/md${mdstart}$part || touch $flag + checkfs /dev/md$mdstart || touch $flag } -mount | grep "on $mntpoint " | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 20m -u $mdstart -bsdlabel -w md$mdstart auto ftest "-O 1" 0 # ufs1 ftest "-O 1" 1 # ufs1, disk full diff --git a/tools/test/stress2/misc/ftruncate2.sh b/tools/test/stress2/misc/ftruncate2.sh index c8c89e7ea5bd..35db3a4c5f8d 100755 --- a/tools/test/stress2/misc/ftruncate2.sh +++ b/tools/test/stress2/misc/ftruncate2.sh @@ -47,9 +47,8 @@ echo "Expect: \"/mnt: write failed, filesystem is full\"" mount | grep $mntpoint | grep -q "on $mntpoint " && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null # Non SU panics -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null # Non SU panics +mount /dev/md$mdstart $mntpoint dir=$mntpoint chmod 777 $dir diff --git a/tools/test/stress2/misc/fts.sh b/tools/test/stress2/misc/fts.sh index b823517f7c3c..84d89ddc9e9e 100755 --- a/tools/test/stress2/misc/fts.sh +++ b/tools/test/stress2/misc/fts.sh @@ -44,11 +44,10 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m diff --git a/tools/test/stress2/misc/fts2.sh b/tools/test/stress2/misc/fts2.sh index d155393e66ba..b19ae1c68e7c 100755 --- a/tools/test/stress2/misc/fts2.sh +++ b/tools/test/stress2/misc/fts2.sh @@ -272,9 +272,8 @@ 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 md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/fts2) diff --git a/tools/test/stress2/misc/fts3.sh b/tools/test/stress2/misc/fts3.sh index 4cb75d8bf6e6..ed15fa451347 100755 --- a/tools/test/stress2/misc/fts3.sh +++ b/tools/test/stress2/misc/fts3.sh @@ -44,9 +44,8 @@ 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 3g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 120 ]; do diff --git a/tools/test/stress2/misc/full.sh b/tools/test/stress2/misc/full.sh index ec99ff88138a..cc6085d77e4e 100755 --- a/tools/test/stress2/misc/full.sh +++ b/tools/test/stress2/misc/full.sh @@ -40,9 +40,8 @@ kldstat -v | grep -q pty || kldload pty # ignore any load failure mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export LOAD=80 @@ -62,6 +61,6 @@ for i in `jot 6`; do [ $i -eq 6 ] && { echo FATAL; fstat -mf $mntpoint; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/fuzz.sh b/tools/test/stress2/misc/fuzz.sh index bfe783752280..189cdbfebd01 100755 --- a/tools/test/stress2/misc/fuzz.sh +++ b/tools/test/stress2/misc/fuzz.sh @@ -54,25 +54,24 @@ tst() { rm -f $D truncate -s 2M $D mdconfig -a -t vnode -f $D -u $mdstart - bsdlabel -w md$mdstart auto - newfs -b 8192 -f 1024 $newfs_flags /dev/md${mdstart}$part > /dev/null 2>&1 - mount /dev/md${mdstart}$part $mntpoint + newfs -b 8192 -f 1024 $newfs_flags /dev/md$mdstart > /dev/null 2>&1 + mount /dev/md$mdstart $mntpoint cp /etc/passwd /etc/group /etc/hosts $mntpoint cp -r /usr/include/ufs $mntpoint umount $mntpoint for i in `jot 50`; do ./fuzz -n 50 $D - if fsck -f -y /dev/md${mdstart}$part 2>&1 | egrep "^[A-Z]" > /dev/null; then - if fsck -f -y /dev/md${mdstart}$part 2>&1 | egrep "^[A-Z]" > /dev/null; then - if fsck -f -y /dev/md${mdstart}$part 2>&1 | egrep "^[A-Z]" > /dev/null; then + if fsck -f -y /dev/md$mdstart 2>&1 | egrep "^[A-Z]" > /dev/null; then + if fsck -f -y /dev/md$mdstart 2>&1 | egrep "^[A-Z]" > /dev/null; then + if fsck -f -y /dev/md$mdstart 2>&1 | egrep "^[A-Z]" > /dev/null; then echo "fsck is giving up in loop $i!" break fi fi fi sync;sync;sync - if mount /dev/md${mdstart}$part $mntpoint; then + if mount /dev/md$mdstart $mntpoint; then ls -l $mntpoint > /dev/null find $mntpoint -exec dd if={} of=/dev/null bs=1m count=3 \; > /dev/null 2>&1 umount $mntpoint diff --git a/tools/test/stress2/misc/getrandom.sh b/tools/test/stress2/misc/getrandom.sh index fe30a688decb..3b2de3ec2a7a 100755 --- a/tools/test/stress2/misc/getrandom.sh +++ b/tools/test/stress2/misc/getrandom.sh @@ -46,9 +46,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e (cd $odir/../testcases/swap; ./swap -t 5m -i 40 -l 100) & diff --git a/tools/test/stress2/misc/gjournal.sh b/tools/test/stress2/misc/gjournal.sh index 7ccc7a70760e..69d449104661 100755 --- a/tools/test/stress2/misc/gjournal.sh +++ b/tools/test/stress2/misc/gjournal.sh @@ -55,9 +55,8 @@ here=`pwd` cd $mntpoint dd if=/dev/zero of=image bs=1m count=1k status=none mdconfig -a -t vnode -f image -u $m -bsdlabel -w md$m auto -newfs md${m}$part > /dev/null -mount /dev/md${m}$part $mp2 +newfs md${m} > /dev/null +mount /dev/md${m} $mp2 # dd will suspend in wdrain echo "Expect \"$mp2: write failed, filesystem is full\"" dd if=/dev/zero of=$mp2/zero bs=1M > /dev/null 2>&1 diff --git a/tools/test/stress2/misc/holdcnt0.sh b/tools/test/stress2/misc/holdcnt0.sh index 7a35eb1dbf5f..2833915a8f27 100755 --- a/tools/test/stress2/misc/holdcnt0.sh +++ b/tools/test/stress2/misc/holdcnt0.sh @@ -50,9 +50,8 @@ cd $here 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 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/holdcnt0) & pid=$! @@ -62,7 +61,7 @@ while kill -0 $! 2> /dev/null; do done wait $pid; s=$? -while mount | grep -q md${mdstart}$part; do +while mount | grep -q md$mdstart; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/holdcnt04.sh b/tools/test/stress2/misc/holdcnt04.sh index 52aff0e3816d..871df7ccb08a 100755 --- a/tools/test/stress2/misc/holdcnt04.sh +++ b/tools/test/stress2/misc/holdcnt04.sh @@ -44,9 +44,8 @@ cd $here 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 -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/holdcnt04) & pid=$! @@ -56,7 +55,7 @@ while kill -0 $! 2> /dev/null; do done wait $pid; s=$? -while mount | grep -q md${mdstart}$part; do +while mount | grep -q md$mdstart; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/isofs3.sh b/tools/test/stress2/misc/isofs3.sh index 476c729568ac..c3ba14335a26 100755 --- a/tools/test/stress2/misc/isofs3.sh +++ b/tools/test/stress2/misc/isofs3.sh @@ -42,17 +42,16 @@ cp -r ../../stress2 $D 2>/dev/null mkisofs -o $I -r $D > /dev/null 2>&1 -mount | grep -q /dev/md${mdstart}$part && umount -f /dev/md${mdstart}$part +mount | grep -q /dev/md$mdstart && umount -f /dev/md${mdstart} [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $I -u $mdstart || exit 1 mount -t cd9660 /dev/md$mdstart $mntpoint || exit 1 m2=$((mdstart + 1)) mdconfig -s 1g -u $m2 -bsdlabel -w md$m2 auto -newfs $newfs_flags md${m2}$part > /dev/null +newfs $newfs_flags md${m2} > /dev/null -mount -o union /dev/md${m2}$part $mntpoint || exit 1 +mount -o union /dev/md${m2} $mntpoint || exit 1 export RUNDIR=$mntpoint/stressX export runRUNTIME=5m diff --git a/tools/test/stress2/misc/kevent11.sh b/tools/test/stress2/misc/kevent11.sh index f3a319f2ecff..a973dfc4fae8 100755 --- a/tools/test/stress2/misc/kevent11.sh +++ b/tools/test/stress2/misc/kevent11.sh @@ -44,9 +44,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e (cd $odir/../testcases/swap; ./swap -t 5m -i 20 -h -l 100 > /dev/null) & diff --git a/tools/test/stress2/misc/kevent6.sh b/tools/test/stress2/misc/kevent6.sh index 528bde5e78a1..41396c5be9a2 100755 --- a/tools/test/stress2/misc/kevent6.sh +++ b/tools/test/stress2/misc/kevent6.sh @@ -49,9 +49,8 @@ mount | grep "on $mntpoint " | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "(cd $mntpoint; /tmp/kevent6)" diff --git a/tools/test/stress2/misc/kevent7.sh b/tools/test/stress2/misc/kevent7.sh index 9383918ea134..8b58c35551f7 100755 --- a/tools/test/stress2/misc/kevent7.sh +++ b/tools/test/stress2/misc/kevent7.sh @@ -53,9 +53,8 @@ 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 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint for i in `jot 5`; do @@ -68,11 +67,11 @@ for i in `jot 5`; do done for i in `jot 5`; do - mount | grep -q md${mdstart}$part && \ + mount | grep -q md$mdstart && \ umount $mntpoint && mdconfig -d -u $mdstart && break sleep 10 done -if mount | grep -q md${mdstart}$part; then +if mount | grep -q md$mdstart; then fstat $mntpoint echo "umount $mntpoint failed" exit 1 diff --git a/tools/test/stress2/misc/kevent8.sh b/tools/test/stress2/misc/kevent8.sh index 66007eb5a2b1..3b9b4899076c 100755 --- a/tools/test/stress2/misc/kevent8.sh +++ b/tools/test/stress2/misc/kevent8.sh @@ -46,9 +46,8 @@ mount | grep "on $mntpoint " | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "(cd $mntpoint; /tmp/kevent8)" & diff --git a/tools/test/stress2/misc/laundry.sh b/tools/test/stress2/misc/laundry.sh index 5d368432ac3c..cd94e4f38972 100755 --- a/tools/test/stress2/misc/laundry.sh +++ b/tools/test/stress2/misc/laundry.sh @@ -48,9 +48,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/linger.sh b/tools/test/stress2/misc/linger.sh index fee2524ffd3b..3d1dd1e3268e 100755 --- a/tools/test/stress2/misc/linger.sh +++ b/tools/test/stress2/misc/linger.sh @@ -42,12 +42,11 @@ cd $here 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 [ $# -eq 1 ] && opt="$1" [ $# -eq 0 ] && opt=$newfs_flags # No argument == default flag -echo "newfs $opt md${mdstart}$part" -newfs $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +echo "newfs $opt md$mdstart" +newfs $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint if ! su $testuser -c "cd $mntpoint; /tmp/linger $size"; then diff --git a/tools/test/stress2/misc/linger2.sh b/tools/test/stress2/misc/linger2.sh index e5dad8d7e21d..7ffde78089d8 100755 --- a/tools/test/stress2/misc/linger2.sh +++ b/tools/test/stress2/misc/linger2.sh @@ -42,11 +42,10 @@ cd $here 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 [ $# -eq 1 ] && opt="$1" [ $# -eq 0 ] && opt=$newfs_flags # No argument == default flag -newfs $opt -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $opt -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint set `df -i $mntpoint | tail -1 | awk '{print $3, $6}'` diff --git a/tools/test/stress2/misc/linger3.sh b/tools/test/stress2/misc/linger3.sh index c888d992138a..b3512041775c 100755 --- a/tools/test/stress2/misc/linger3.sh +++ b/tools/test/stress2/misc/linger3.sh @@ -42,12 +42,11 @@ mount | grep "$mntpoint" | grep -q md$mdstart && 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 [ $# -eq 1 ] && opt="$1" [ $# -eq 0 ] && opt=$newfs_flags # No argument == default flag -echo "newfs $opt md${mdstart}$part" -newfs $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +echo "newfs $opt md$mdstart" +newfs $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint chmod 777 $mntpoint diff --git a/tools/test/stress2/misc/linger4.sh b/tools/test/stress2/misc/linger4.sh index 1578575fa387..aade4a4ab006 100755 --- a/tools/test/stress2/misc/linger4.sh +++ b/tools/test/stress2/misc/linger4.sh @@ -42,12 +42,11 @@ mount | grep "$mntpoint" | grep -q md$mdstart && 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 [ $# -eq 1 ] && opt="$1" [ $# -eq 0 ] && opt="$newfs_flags -n" # No argument == default flag -echo "newfs $opt md${mdstart}$part" -newfs $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +echo "newfs $opt md$mdstart" +newfs $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint chmod 777 $mntpoint diff --git a/tools/test/stress2/misc/link.sh b/tools/test/stress2/misc/link.sh index 64f76ca5f3b0..5be9c1cba293 100755 --- a/tools/test/stress2/misc/link.sh +++ b/tools/test/stress2/misc/link.sh @@ -45,9 +45,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint daemon sh -c "(cd $here/../testcases/swap; ./swap -t 5m -i 20 -h -l 100)" \ > /dev/null 2>&1 @@ -55,7 +54,7 @@ daemon sh -c "(cd $here/../testcases/swap; ./swap -t 5m -i 20 -h -l 100)" \ for i in `jot 100`; do umount -f $mntpoint && - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint sleep .1 done pkill -9 link diff --git a/tools/test/stress2/misc/link2.sh b/tools/test/stress2/misc/link2.sh index 94116c0dc081..650509c55814 100755 --- a/tools/test/stress2/misc/link2.sh +++ b/tools/test/stress2/misc/link2.sh @@ -42,9 +42,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint daemon sh -c "(cd $here/../testcases/swap; ./swap -t 5m -i 20 -h -l 100)" \ > /dev/null 2>&1 @@ -53,7 +52,7 @@ daemon sh -c "(cd $here/../testcases/swap; ./swap -t 5m -i 20 -h -l 100)" \ m1=`vmstat -m | awk '/ mount/ {print $2}'` for i in `jot 100`; do umount -f $mntpoint && - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint sleep .1 done m2=`vmstat -m | awk '/ mount/ {print $2}'` diff --git a/tools/test/stress2/misc/lockf3.sh b/tools/test/stress2/misc/lockf3.sh index 4493fa214a33..02dc86b7884f 100755 --- a/tools/test/stress2/misc/lockf3.sh +++ b/tools/test/stress2/misc/lockf3.sh @@ -40,10 +40,9 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 40m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint for i in `jot 3`; do diff --git a/tools/test/stress2/misc/lockf4.sh b/tools/test/stress2/misc/lockf4.sh index 690bad033cf4..6427a8a02ff9 100755 --- a/tools/test/stress2/misc/lockf4.sh +++ b/tools/test/stress2/misc/lockf4.sh @@ -42,9 +42,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "(cd $mntpoint; /tmp/lockf4)" & diff --git a/tools/test/stress2/misc/lstat.sh b/tools/test/stress2/misc/lstat.sh index a82692979cbe..b380fee35904 100755 --- a/tools/test/stress2/misc/lstat.sh +++ b/tools/test/stress2/misc/lstat.sh @@ -44,9 +44,8 @@ cd $odir 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 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -n -b 4096 -f 512 -i 1024 md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint || exit 1 +newfs -n -b 4096 -f 512 -i 1024 md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint || exit 1 path=$mntpoint/a/b/c mkdir -p $path diff --git a/tools/test/stress2/misc/mac_chkexec.sh b/tools/test/stress2/misc/mac_chkexec.sh index d3e961b02200..e1cb6f37169d 100755 --- a/tools/test/stress2/misc/mac_chkexec.sh +++ b/tools/test/stress2/misc/mac_chkexec.sh @@ -35,15 +35,14 @@ exit 0 # Not part of the kernel sysctl -a | ! grep -q security.mac.chkexec && echo "chkexec.ko must be loaded" && exit 1 -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 12m -u $mdstart -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -tunefs -l enable /dev/md${mdstart}$part -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +tunefs -l enable /dev/md$mdstart +mount /dev/md$mdstart $mntpoint cp /bin/ls $mntpoint setfmac chkexec/md5:`md5 -q $mntpoint/ls` $mntpoint/ls diff --git a/tools/test/stress2/misc/marcus.sh b/tools/test/stress2/misc/marcus.sh index 727b1ad56c17..87fc2664d48a 100755 --- a/tools/test/stress2/misc/marcus.sh +++ b/tools/test/stress2/misc/marcus.sh @@ -35,9 +35,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m @@ -50,6 +49,6 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/marcus2.sh b/tools/test/stress2/misc/marcus2.sh index 1e58c52ddfde..ddd358453a2d 100755 --- a/tools/test/stress2/misc/marcus2.sh +++ b/tools/test/stress2/misc/marcus2.sh @@ -39,9 +39,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m @@ -68,6 +67,6 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/marcus5.sh b/tools/test/stress2/misc/marcus5.sh index 97c2465ba49c..f95887a20d56 100755 --- a/tools/test/stress2/misc/marcus5.sh +++ b/tools/test/stress2/misc/marcus5.sh @@ -39,9 +39,8 @@ 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 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint size=$((`sysctl -n hw.physmem` / 1024 / 1024)) @@ -80,6 +79,6 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$! +checkfs /dev/md$mdstart; s=$! mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/marcus6.sh b/tools/test/stress2/misc/marcus6.sh index 076a51e1e4a4..1a209b2256ee 100755 --- a/tools/test/stress2/misc/marcus6.sh +++ b/tools/test/stress2/misc/marcus6.sh @@ -38,9 +38,8 @@ 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 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint size=$((`sysctl -n hw.physmem` / 1024 / 1024)) @@ -78,6 +77,6 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 [ $((n += 1)) -gt 60 ] && { echo "Timed out"; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$! +checkfs /dev/md$mdstart; s=$! mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/marcus7.sh b/tools/test/stress2/misc/marcus7.sh index 94800c5c5f60..e196a1e60269 100755 --- a/tools/test/stress2/misc/marcus7.sh +++ b/tools/test/stress2/misc/marcus7.sh @@ -42,9 +42,8 @@ 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 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint size=$((`sysctl -n hw.physmem` / 1024 / 1024)) @@ -85,6 +84,6 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$! +checkfs /dev/md$mdstart; s=$! mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/md.sh b/tools/test/stress2/misc/md.sh index 47e491e2b841..ae0b090a86cc 100755 --- a/tools/test/stress2/misc/md.sh +++ b/tools/test/stress2/misc/md.sh @@ -33,13 +33,12 @@ . ../default.cfg -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2m -u $mdstart -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export KBLOCKS=30000 # Exaggerate disk capacity diff --git a/tools/test/stress2/misc/md3.sh b/tools/test/stress2/misc/md3.sh index 626d578e54ae..24354c19c4a7 100755 --- a/tools/test/stress2/misc/md3.sh +++ b/tools/test/stress2/misc/md3.sh @@ -36,10 +36,9 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1400m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint # Stop FS "out of inodes" problem by only using 70% set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` diff --git a/tools/test/stress2/misc/md4.sh b/tools/test/stress2/misc/md4.sh index 484e531e3f6c..0d760b99b058 100755 --- a/tools/test/stress2/misc/md4.sh +++ b/tools/test/stress2/misc/md4.sh @@ -31,6 +31,7 @@ # Fixed in r250966. [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -z "`which bsdlabel`" ] && exit 0 status=0 MD_DEV=`mdconfig -an -t swap -s 1m -x 63 -y 16` diff --git a/tools/test/stress2/misc/md9.sh b/tools/test/stress2/misc/md9.sh index a232ade6963f..ab5024404b36 100755 --- a/tools/test/stress2/misc/md9.sh +++ b/tools/test/stress2/misc/md9.sh @@ -43,9 +43,8 @@ mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint diskimage=$mp2/diskimage dd if=/dev/zero of=$diskimage bs=1m count=2k status=none mdconfig -a -t vnode -f $diskimage -u $mdstart -bsdlabel -w md$mdstart auto -newfs -U /dev/md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -U /dev/md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint for i in `jot 10`; do umount $mntpoint && break diff --git a/tools/test/stress2/misc/mdconfig4.sh b/tools/test/stress2/misc/mdconfig4.sh index fb7bdd869b2a..c8e0530741c0 100755 --- a/tools/test/stress2/misc/mdconfig4.sh +++ b/tools/test/stress2/misc/mdconfig4.sh @@ -37,7 +37,6 @@ 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 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto newfs $newfs_flags md$mdstart > /dev/null mount /dev/md$mdstart $mntpoint diff --git a/tools/test/stress2/misc/memguard.sh b/tools/test/stress2/misc/memguard.sh index 9b2a3a964d1b..2f80631ee308 100755 --- a/tools/test/stress2/misc/memguard.sh +++ b/tools/test/stress2/misc/memguard.sh @@ -38,11 +38,10 @@ 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 20m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m diff --git a/tools/test/stress2/misc/memguard2.sh b/tools/test/stress2/misc/memguard2.sh index 4c4619ef89e3..60d6f00357b8 100755 --- a/tools/test/stress2/misc/memguard2.sh +++ b/tools/test/stress2/misc/memguard2.sh @@ -39,11 +39,10 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=30s diff --git a/tools/test/stress2/misc/memguard3.sh b/tools/test/stress2/misc/memguard3.sh index 8a7705c71537..d54c8f8e06b8 100755 --- a/tools/test/stress2/misc/memguard3.sh +++ b/tools/test/stress2/misc/memguard3.sh @@ -42,9 +42,8 @@ sysctl vm.memguard.frequency=1000 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 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m @@ -55,7 +54,7 @@ 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}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart sysctl vm.memguard.frequency=0 > /dev/null diff --git a/tools/test/stress2/misc/memguard4.sh b/tools/test/stress2/misc/memguard4.sh index 323183caf96d..691deec627ca 100755 --- a/tools/test/stress2/misc/memguard4.sh +++ b/tools/test/stress2/misc/memguard4.sh @@ -38,11 +38,10 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m diff --git a/tools/test/stress2/misc/mkfifo.sh b/tools/test/stress2/misc/mkfifo.sh index a0f012da5baa..1ea7dca8472f 100755 --- a/tools/test/stress2/misc/mkfifo.sh +++ b/tools/test/stress2/misc/mkfifo.sh @@ -44,11 +44,10 @@ 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_flags" = "-U" ] && opt="-j" -newfs $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m diff --git a/tools/test/stress2/misc/mkfifo2c.sh b/tools/test/stress2/misc/mkfifo2c.sh index 6d83a5aca4a2..92a69b37d5fa 100755 --- a/tools/test/stress2/misc/mkfifo2c.sh +++ b/tools/test/stress2/misc/mkfifo2c.sh @@ -45,12 +45,11 @@ 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 [ $# -eq 1 ] && opt="$1" [ $# -eq 0 ] && opt="-j" -newfs $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m diff --git a/tools/test/stress2/misc/mkfifo2d.sh b/tools/test/stress2/misc/mkfifo2d.sh index 74d5875d090f..e5f2b257470a 100755 --- a/tools/test/stress2/misc/mkfifo2d.sh +++ b/tools/test/stress2/misc/mkfifo2d.sh @@ -39,10 +39,9 @@ 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 $newfs_flags md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m diff --git a/tools/test/stress2/misc/mknod.sh b/tools/test/stress2/misc/mknod.sh index d2b9aa617577..4a5a826654fa 100755 --- a/tools/test/stress2/misc/mknod.sh +++ b/tools/test/stress2/misc/mknod.sh @@ -46,9 +46,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/mlockall5.sh b/tools/test/stress2/misc/mlockall5.sh index 847909b478c2..18f568ac7024 100755 --- a/tools/test/stress2/misc/mlockall5.sh +++ b/tools/test/stress2/misc/mlockall5.sh @@ -56,9 +56,8 @@ cd $odir mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint || exit 1 +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint || exit 1 (cd $mntpoint; /tmp/mlockall5 || echo FAIL) diff --git a/tools/test/stress2/misc/mlockall6.sh b/tools/test/stress2/misc/mlockall6.sh index a755350f673d..b83e033736fc 100755 --- a/tools/test/stress2/misc/mlockall6.sh +++ b/tools/test/stress2/misc/mlockall6.sh @@ -46,9 +46,8 @@ cd $odir 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 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint || exit 1 +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint || exit 1 daemon sh -c "(cd $odir/../testcases/swap; ./swap -t 20m -i 20 -l 100)" \ > /dev/null 2>&1 diff --git a/tools/test/stress2/misc/mmap24.sh b/tools/test/stress2/misc/mmap24.sh index 4a25a0e3520f..867c42f0ed9b 100755 --- a/tools/test/stress2/misc/mmap24.sh +++ b/tools/test/stress2/misc/mmap24.sh @@ -45,9 +45,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint cp /tmp/mmap24 $mntpoint diff --git a/tools/test/stress2/misc/mmap29.sh b/tools/test/stress2/misc/mmap29.sh index e6aacc15e48e..207bdb137b99 100755 --- a/tools/test/stress2/misc/mmap29.sh +++ b/tools/test/stress2/misc/mmap29.sh @@ -13,9 +13,8 @@ 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 +newfs -U md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/mmap29 cd /tmp diff --git a/tools/test/stress2/misc/mmap33.sh b/tools/test/stress2/misc/mmap33.sh index 70ac054a9934..de7262c1bf1f 100755 --- a/tools/test/stress2/misc/mmap33.sh +++ b/tools/test/stress2/misc/mmap33.sh @@ -94,9 +94,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e file=file @@ -109,7 +108,7 @@ sum1=`md5 < $mntpoint/$file` { ls -l mmap33.core; mv mmap33.core /tmp; s=1; } cd $odir umount $mntpoint -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint # This fails for truncate size < 512 sum2=`md5 < $mntpoint/$file` [ $sum1 = $sum2 ] || diff --git a/tools/test/stress2/misc/mmap4.sh b/tools/test/stress2/misc/mmap4.sh index 8c84401fb960..5303a4fbaeba 100755 --- a/tools/test/stress2/misc/mmap4.sh +++ b/tools/test/stress2/misc/mmap4.sh @@ -46,10 +46,9 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 40m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint /tmp/mmap4 /$mntpoint/file diff --git a/tools/test/stress2/misc/mount.sh b/tools/test/stress2/misc/mount.sh index 4b020ca919bd..79639c90ed24 100755 --- a/tools/test/stress2/misc/mount.sh +++ b/tools/test/stress2/misc/mount.sh @@ -64,15 +64,14 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null # The test: echo "Expect: mount: /dev/md5a: Device busy" -mount -r /dev/md${mdstart}$part $mntpoint -mount -r /dev/md${mdstart}$part $mntpoint +mount -r /dev/md$mdstart $mntpoint +mount -r /dev/md$mdstart $mntpoint umount $mntpoint ls -lR $mntpoint > /dev/null # panic diff --git a/tools/test/stress2/misc/mount2.sh b/tools/test/stress2/misc/mount2.sh index d4b30bafe711..cfb3b81e47fb 100755 --- a/tools/test/stress2/misc/mount2.sh +++ b/tools/test/stress2/misc/mount2.sh @@ -47,8 +47,7 @@ for i in `jot $mounts`; do dd if=/dev/zero of=$D$m bs=1m count=1 status=none mdconfig -a -t vnode -f $D$m -u $m || { rm -f $D$m; exit 1; } - bsdlabel -w md$m auto - newfs md${m}$part > /dev/null + newfs md${m} > /dev/null done # start the parallel tests @@ -57,7 +56,7 @@ for i in `jot $mounts`; do start=`date +%s` while [ $((`date +%s` - start)) -lt 300 ]; do opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` - mount /dev/md${m}$part ${mntpoint}$m + mount /dev/md${m} ${mntpoint}$m while mount | grep -q ${mntpoint}$m; do umount $opt ${mntpoint}$m > /dev/null 2>&1 done diff --git a/tools/test/stress2/misc/mountro.sh b/tools/test/stress2/misc/mountro.sh index 38f6c6e5bd10..74fddb10b751 100755 --- a/tools/test/stress2/misc/mountro.sh +++ b/tools/test/stress2/misc/mountro.sh @@ -41,9 +41,8 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null 2>&1 +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/stressX chmod 777 $mntpoint/stressX diff --git a/tools/test/stress2/misc/mountro2.sh b/tools/test/stress2/misc/mountro2.sh index a57c6776fb03..33ccb9694dae 100755 --- a/tools/test/stress2/misc/mountro2.sh +++ b/tools/test/stress2/misc/mountro2.sh @@ -40,9 +40,8 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null 2>&1 +mount /dev/md$mdstart $mntpoint mtree -deU -f /etc/mtree/BSD.usr.dist -p $mntpoint/ >> /dev/null sync ; sync ; sync diff --git a/tools/test/stress2/misc/mountro3.sh b/tools/test/stress2/misc/mountro3.sh index e1749dfdc391..fd2959f59de6 100755 --- a/tools/test/stress2/misc/mountro3.sh +++ b/tools/test/stress2/misc/mountro3.sh @@ -36,18 +36,17 @@ D=$diskimage dd if=/dev/zero of=$D bs=1m count=64 status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; } -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 +newfs $newfs_flags md$mdstart > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint touch $mntpoint/file umount $mntpoint -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint rm $mntpoint/file mount -u -o ro $mntpoint # Should fail with "Device busy" diff --git a/tools/test/stress2/misc/mountro4.sh b/tools/test/stress2/misc/mountro4.sh index b6ff922d5ff9..eddc345c85af 100755 --- a/tools/test/stress2/misc/mountro4.sh +++ b/tools/test/stress2/misc/mountro4.sh @@ -77,7 +77,9 @@ umount $mntpoint # msdosfs [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint || exit 1 diff --git a/tools/test/stress2/misc/mountu.sh b/tools/test/stress2/misc/mountu.sh index 1c1b619463cd..838850ef3e96 100755 --- a/tools/test/stress2/misc/mountu.sh +++ b/tools/test/stress2/misc/mountu.sh @@ -74,7 +74,9 @@ mapfile=/tmp/mountu.sh.map mount | grep -q "$mntpoint " && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 100m -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint @@ -126,7 +128,9 @@ fi # msdos if [ -x /sbin/mount_msdosfs ]; then mdconfig -a -t swap -s 100m -u $mdstart - bsdlabel -w md$mdstart auto + gpart create -s bsd md$mdstart > /dev/null + gpart add -t freebsd-ufs md$mdstart > /dev/null + part=a newfs_msdos -F 16 -b 8192 /dev/md${mdstart}$part > /dev/null 2>&1 mount_msdosfs -m 777 /dev/md${mdstart}$part $mntpoint /tmp/mountu MSDOS $file & diff --git a/tools/test/stress2/misc/msdos.sh b/tools/test/stress2/misc/msdos.sh index 2324404bfd16..c0f38ba3011b 100755 --- a/tools/test/stress2/misc/msdos.sh +++ b/tools/test/stress2/misc/msdos.sh @@ -38,7 +38,9 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint diff --git a/tools/test/stress2/misc/msdos10.sh b/tools/test/stress2/misc/msdos10.sh index 09613a859082..b581a71d3519 100755 --- a/tools/test/stress2/misc/msdos10.sh +++ b/tools/test/stress2/misc/msdos10.sh @@ -49,7 +49,9 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart set -e mdconfig -a -t swap -s 4g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -b 1024 /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint set +e diff --git a/tools/test/stress2/misc/msdos11.sh b/tools/test/stress2/misc/msdos11.sh index af0958686118..c14ef55f1f7c 100755 --- a/tools/test/stress2/misc/msdos11.sh +++ b/tools/test/stress2/misc/msdos11.sh @@ -45,7 +45,9 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart set -e mdconfig -a -t swap -s 4g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -b 1024 /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint set +e diff --git a/tools/test/stress2/misc/msdos12.sh b/tools/test/stress2/misc/msdos12.sh index 0c1c518575e8..da5c8104c3a6 100755 --- a/tools/test/stress2/misc/msdos12.sh +++ b/tools/test/stress2/misc/msdos12.sh @@ -40,7 +40,9 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -F 32 -b 8192 /dev/md$mdstart$part > /dev/null mount -t msdosfs /dev/md$mdstart$part $mntpoint mkdir $mntpoint/stressX diff --git a/tools/test/stress2/misc/msdos13.sh b/tools/test/stress2/misc/msdos13.sh index 1e6ee205e4f6..52c3d9ece686 100755 --- a/tools/test/stress2/misc/msdos13.sh +++ b/tools/test/stress2/misc/msdos13.sh @@ -40,7 +40,9 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -F 32 -b 8192 /dev/md$mdstart$part > /dev/null mount -t msdosfs /dev/md$mdstart$part $mntpoint mkdir $mntpoint/stressX diff --git a/tools/test/stress2/misc/msdos14.sh b/tools/test/stress2/misc/msdos14.sh index 1a39d60f0781..0f5b5b9ab736 100755 --- a/tools/test/stress2/misc/msdos14.sh +++ b/tools/test/stress2/misc/msdos14.sh @@ -86,7 +86,9 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart set -e mdconfig -a -t swap -s 4g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -b 1024 /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint set +e diff --git a/tools/test/stress2/misc/msdos2.sh b/tools/test/stress2/misc/msdos2.sh index 838585595ec3..192ea7905d3b 100755 --- a/tools/test/stress2/misc/msdos2.sh +++ b/tools/test/stress2/misc/msdos2.sh @@ -38,14 +38,17 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint u=$((mdstart + 1)) mdconfig -l | grep -q $u && mdconfig -d -u $u mdconfig -a -t swap -s 1g -u $u -bsdlabel -w md$u auto +gpart create -s bsd md$u > /dev/null +gpart add -t freebsd-ufs md$u > /dev/null newfs_msdos /dev/md${u}$part > /dev/null mount -u /dev/md${u}$part $mntpoint > /dev/null 2>&1 # panic diff --git a/tools/test/stress2/misc/msdos3.sh b/tools/test/stress2/misc/msdos3.sh index e251f7bf7ee7..38344e37d5d8 100755 --- a/tools/test/stress2/misc/msdos3.sh +++ b/tools/test/stress2/misc/msdos3.sh @@ -38,7 +38,9 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint diff --git a/tools/test/stress2/misc/msdos4.sh b/tools/test/stress2/misc/msdos4.sh index 807c3b5206eb..b90f7d8229ea 100755 --- a/tools/test/stress2/misc/msdos4.sh +++ b/tools/test/stress2/misc/msdos4.sh @@ -41,7 +41,9 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint || exit 1 diff --git a/tools/test/stress2/misc/msdos5.sh b/tools/test/stress2/misc/msdos5.sh index 815eeca6fd4c..4b7b961a622b 100755 --- a/tools/test/stress2/misc/msdos5.sh +++ b/tools/test/stress2/misc/msdos5.sh @@ -42,7 +42,9 @@ cd /tmp 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 3g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -F 32 -b 8192 /dev/md${mdstart}$part > /dev/null 2>&1 mount_msdosfs -m 777 /dev/md${mdstart}$part $mntpoint diff --git a/tools/test/stress2/misc/msdos6.sh b/tools/test/stress2/misc/msdos6.sh index 475989b3fa1c..e99874e78aa1 100755 --- a/tools/test/stress2/misc/msdos6.sh +++ b/tools/test/stress2/misc/msdos6.sh @@ -38,6 +38,7 @@ mounts=15 # Number of parallel scripts cont=/tmp/msdos6.continue mdstart=$mdstart # Use md unit numbers from this point +part=a if [ $# -eq 0 ]; then touch $cont @@ -49,7 +50,8 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s 1g -u $m - bsdlabel -w md$m auto + gpart create -s bsd md$m > /dev/null + gpart add -t freebsd-ufs md$m > /dev/null newfs_msdos -F 32 -b 8192 /dev/md${m}$part > /dev/null 2>&1 mount -t msdosfs /dev/md${m}$part ${mntpoint}$m (mkdir ${mntpoint}$m/test$i; cd ${mntpoint}$m/test$i; /tmp/fstool -l -f 100 -n 100 -s ${i}k) diff --git a/tools/test/stress2/misc/msdos7.sh b/tools/test/stress2/misc/msdos7.sh index 7bebe3703848..ff309de0ace8 100755 --- a/tools/test/stress2/misc/msdos7.sh +++ b/tools/test/stress2/misc/msdos7.sh @@ -39,7 +39,9 @@ mount | grep -q "on $mntpoint " && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -F 32 -b 8192 /dev/md${mdstart}$part > /dev/null || exit 1 mount -t msdosfs /dev/md${mdstart}$part $mntpoint diff --git a/tools/test/stress2/misc/msdos8.sh b/tools/test/stress2/misc/msdos8.sh index 58f0390e195d..84192ee6895e 100755 --- a/tools/test/stress2/misc/msdos8.sh +++ b/tools/test/stress2/misc/msdos8.sh @@ -45,7 +45,9 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos /dev/md${mdstart}$part #> /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint || exit 1 diff --git a/tools/test/stress2/misc/msdos9.sh b/tools/test/stress2/misc/msdos9.sh index cafabc546aa9..d325d4300067 100755 --- a/tools/test/stress2/misc/msdos9.sh +++ b/tools/test/stress2/misc/msdos9.sh @@ -49,7 +49,9 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart set -e mdconfig -a -t swap -s 4g -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs_msdos -b 1024 /dev/md${mdstart}$part > /dev/null mount -t msdosfs /dev/md${mdstart}$part $mntpoint set +e diff --git a/tools/test/stress2/misc/namecache2.sh b/tools/test/stress2/misc/namecache2.sh index a5dd4319fc66..9fcfe5e0226c 100755 --- a/tools/test/stress2/misc/namecache2.sh +++ b/tools/test/stress2/misc/namecache2.sh @@ -52,9 +52,8 @@ cd $odir 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/namecache2) @@ -67,8 +66,8 @@ if [ "$f" != '*' ]; then echo "ls -ali $mntpoint" ls -ali $mntpoint echo "" - echo "fsdb -r /dev/md${mdstart}$part" - fsdb -r /dev/md${mdstart}$part <<-EF + echo "fsdb -r /dev/md$mdstart" + fsdb -r /dev/md$mdstart <<-EF ls quit EF diff --git a/tools/test/stress2/misc/nbufkv.sh b/tools/test/stress2/misc/nbufkv.sh index db2c45feb496..1f9434d2cf75 100755 --- a/tools/test/stress2/misc/nbufkv.sh +++ b/tools/test/stress2/misc/nbufkv.sh @@ -65,31 +65,29 @@ mp2=${mntpoint}2 dd if=/dev/zero of=$d1 bs=1m count=${size}k status=none || exit 1 cp $d1 $d2 || exit 1 -mount | grep -q /dev/md${u2}$part && umount -f /dev/md${u2}$part -mount | grep -q /dev/md${u1}$part && umount -f /dev/md${u1}$part +mount | grep -q /dev/md$u2 && umount -f /dev/md$u2 +mount | grep -q /dev/md$u1 && umount -f /dev/md$u1 [ -c /dev/md$u2 ] && mdconfig -d -u $u2 [ -c /dev/md$u1 ] && mdconfig -d -u $u1 mdconfig -a -t vnode -f $d1 -u $u1 || exit 1 -bsdlabel -w md$u1 auto -newfs -b 65536 -f 65536 -O2 md${u1}$part > /dev/null +newfs -b 65536 -f 65536 -O2 md$u1 > /dev/null mdconfig -a -t vnode -f $d2 -u $u2 || exit 1 -bsdlabel -w md$u2 auto -newfs -b 65536 -f 65536 -O2 md${u2}$part > /dev/null +newfs -b 65536 -f 65536 -O2 md$u2 > /dev/null -mount /dev/md${u1}$part $mp1 -mount /dev/md${u2}$part $mp2 +mount /dev/md$u1 $mp1 +mount /dev/md$u2 $mp2 /tmp/nbufkv $mp1 & /tmp/nbufkv $mp2 & wait -umount /dev/md${u2}$part -umount /dev/md${u1}$part +umount /dev/md$u2 +umount /dev/md$u1 -mount | grep -q /dev/md${u2}$part && umount -f /dev/md${u2}$part -mount | grep -q /dev/md${u1}$part && umount -f /dev/md${u1}$part +mount | grep -q /dev/md$u2 && umount -f /dev/md$u2 +mount | grep -q /dev/md$u1 && umount -f /dev/md$u1 mdconfig -d -u $u2 mdconfig -d -u $u1 diff --git a/tools/test/stress2/misc/newfs.sh b/tools/test/stress2/misc/newfs.sh index 8ef7b9eae31e..d953cc669bb9 100755 --- a/tools/test/stress2/misc/newfs.sh +++ b/tools/test/stress2/misc/newfs.sh @@ -37,12 +37,11 @@ . ../default.cfg -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto echo "Expect warnings from SU and SU+J." log=/tmp/newfs.sh.log @@ -59,8 +58,8 @@ for opt in -O1 -O2 -U -j; do for i in 8 4 2 1; do fragsize=$((blocksize / i)) newfs $opt -b $blocksize -f $fragsize \ - md${mdstart}$part > /dev/null 2>&1 || continue - mount /dev/md${mdstart}$part $mntpoint + md$mdstart > /dev/null 2>&1 || continue + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint rm -rf /tmp/stressX.control su $testuser -c \ @@ -69,10 +68,10 @@ for opt in -O1 -O2 -U -j; do ../tools/killall.sh wait while mount | grep "$mntpoint" | \ - grep -q md${mdstart}$part; do + grep -q md$mdstart; do umount $mntpoint > /dev/null 2>&1 || sleep 1 done - checkfs /dev/md${mdstart}$part > $log 2>&1 || { + checkfs /dev/md$mdstart > $log 2>&1 || { cmd="newfs $opt -b $blocksize -f $fragsize" # if ! grep -q -- "$cmd" $0; then s=1 diff --git a/tools/test/stress2/misc/newfs2.sh b/tools/test/stress2/misc/newfs2.sh index ac891e7926fb..0706b30e40b8 100755 --- a/tools/test/stress2/misc/newfs2.sh +++ b/tools/test/stress2/misc/newfs2.sh @@ -34,7 +34,7 @@ size=$((32 * 1024 * 1024)) -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart s=0 @@ -45,18 +45,17 @@ while [ $size -le $((900 * 1024 * 1024)) ]; do dd if=/dev/zero of=$diskimage bs=1m count=$mb status=none mdconfig -a -t vnode -f $diskimage -u $mdstart || { rm $diskimage; exit 1; } - bsdlabel -w md$mdstart auto - newfs -b 32768 -f 4096 -O2 md${mdstart}$part > /dev/null 2>&1 - mount /dev/md${mdstart}$part $mntpoint + newfs -b 32768 -f 4096 -O2 md$mdstart > /dev/null 2>&1 + mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=30s export RUNTIME=$runRUNTIME export CTRLDIR=$mntpoint/stressX.control (cd ..; ./run.sh disk.cfg) > /dev/null - while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do + while mount | grep "$mntpoint" | grep -q md$mdstart; do umount $mntpoint > /dev/null 2>&1 done - checkfs md${mdstart}$part || s=1 + checkfs md$mdstart || s=1 mdconfig -d -u $mdstart size=$((size + 32 * 1024 * 1024)) if [ $((`date '+%s'` - start)) -gt 1200 ]; then diff --git a/tools/test/stress2/misc/newfs3.sh b/tools/test/stress2/misc/newfs3.sh index f6dd84e801bc..8bb8125db8aa 100755 --- a/tools/test/stress2/misc/newfs3.sh +++ b/tools/test/stress2/misc/newfs3.sh @@ -40,7 +40,7 @@ size=$((32 * 1024 * 1024)) opt="-O2" # newfs option. Eg. -U -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart s=0 @@ -50,14 +50,13 @@ while [ $size -le $((128 * 1024 * 1024)) ]; do dd if=/dev/zero of=$diskimage bs=1m count=$mb status=none mdconfig -a -t vnode -f $diskimage -u $mdstart || { rm -f $diskimage; exit 1; } - bsdlabel -w md$mdstart auto blocksize=4096 while [ $blocksize -le 65536 ]; do for i in 1 2 4 8; do fragsize=$((blocksize / i)) - newfs -b $blocksize -f $fragsize $opt md${mdstart}$part > \ + newfs -b $blocksize -f $fragsize $opt md$mdstart > \ /dev/null 2>&1 - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=15s export RUNTIME=$runRUNTIME @@ -67,10 +66,10 @@ while [ $size -le $((128 * 1024 * 1024)) ]; do ../tools/killall.sh wait while mount | grep "$mntpoint" | \ - grep -q md${mdstart}$part; do + grep -q md$mdstart; do umount $mntpoint > /dev/null 2>&1 done - checkfs /dev/md${mdstart}$part || s=1 + checkfs /dev/md$mdstart || s=1 done blocksize=$((blocksize * 2)) done diff --git a/tools/test/stress2/misc/newfs4.sh b/tools/test/stress2/misc/newfs4.sh index 46d563a49460..55ac3aaae3da 100755 --- a/tools/test/stress2/misc/newfs4.sh +++ b/tools/test/stress2/misc/newfs4.sh @@ -44,7 +44,7 @@ mycc -o newfs4 -Wall -Wextra newfs4.c || exit 1 rm -f newfs4.c cd $odir -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart size=9 # Gb @@ -58,9 +58,8 @@ dd if=/dev/zero of=$diskimage bs=1m count=$((size * 1024)) status=none || blocksize="-b 65536" opt="-O2 -U" mdconfig -a -t vnode -f $diskimage -u $mdstart -bsdlabel -w md$mdstart auto -newfs $blocksize $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $blocksize $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint truncate -s 2g f1 @@ -73,10 +72,10 @@ truncate -s 2g f4 /tmp/newfs4 f4 & wait -while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do +while mount | grep "$mntpoint" | grep -q md$mdstart; do umount -f $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart rm -f /tmp/newfs4 diff --git a/tools/test/stress2/misc/newfs5.sh b/tools/test/stress2/misc/newfs5.sh index f41da12e28dd..29c7e1a84b09 100755 --- a/tools/test/stress2/misc/newfs5.sh +++ b/tools/test/stress2/misc/newfs5.sh @@ -39,16 +39,15 @@ mycc -o newfs5 -Wall -Wextra newfs5.c rm -f newfs5.c cd $odir -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart blocksize="-b 65536" opt="-O2 -U" size=9 # Gb mdconfig -a -t swap -s ${size}g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $blocksize $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $blocksize $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint truncate -s 2g f1 @@ -61,10 +60,10 @@ truncate -s 2g f4 /tmp/newfs5 f4 & wait -while mount | grep "$mntpoint" | grep -q md${mdstart}$part; do +while mount | grep "$mntpoint" | grep -q md$mdstart; do umount -f $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart rm -f $diskimage diff --git a/tools/test/stress2/misc/nfs10.sh b/tools/test/stress2/misc/nfs10.sh index 15f449548f45..f8c6e3c76c56 100755 --- a/tools/test/stress2/misc/nfs10.sh +++ b/tools/test/stress2/misc/nfs10.sh @@ -45,11 +45,10 @@ 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 $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mount -t nfs -o nfsv4 -o rw,retrycnt=3 127.0.0.1:$mntpoint $m2 diff --git a/tools/test/stress2/misc/nfs11.sh b/tools/test/stress2/misc/nfs11.sh index e132ad9f894e..1ba0124f939e 100755 --- a/tools/test/stress2/misc/nfs11.sh +++ b/tools/test/stress2/misc/nfs11.sh @@ -42,11 +42,10 @@ 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 $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mount -t nfs -o nfsv4 -o rw,retrycnt=3 127.0.0.1:$mntpoint $m2 diff --git a/tools/test/stress2/misc/nfs18.sh b/tools/test/stress2/misc/nfs18.sh index bf9e0fc8010e..46330a0290a1 100755 --- a/tools/test/stress2/misc/nfs18.sh +++ b/tools/test/stress2/misc/nfs18.sh @@ -47,7 +47,9 @@ kill -HUP `pgrep mountd` # loopback workaround mdconfig -a -t swap -s 1g -u $mdstart set -e -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart +gpart add -t freebsd-ufs md$mdstart +part=a newfs_msdos -F 32 -b 8192 /dev/md${mdstart}$part > /dev/null mkdir -p $mp1; chmod 777 $mp1 mount -t msdosfs -o rw /dev/md${mdstart}$part $mp1 diff --git a/tools/test/stress2/misc/nfs2.sh b/tools/test/stress2/misc/nfs2.sh index 9d470c18e8f0..16912e59a16e 100755 --- a/tools/test/stress2/misc/nfs2.sh +++ b/tools/test/stress2/misc/nfs2.sh @@ -45,7 +45,9 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto +gpart create -s bsd md$mdstart +gpart add -t freebsd-ufs md$mdstart +part=a newfs_msdos -F 16 -b 8192 /dev/md${mdstart}$part > /dev/null mount -t msdosfs -o rw /dev/md${mdstart}$part $mntpoint diff --git a/tools/test/stress2/misc/nfs5.sh b/tools/test/stress2/misc/nfs5.sh index 1f311ef47baf..893c4b7f7e8f 100755 --- a/tools/test/stress2/misc/nfs5.sh +++ b/tools/test/stress2/misc/nfs5.sh @@ -39,9 +39,8 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/stressX chmod 777 $mntpoint/stressX diff --git a/tools/test/stress2/misc/nfs6.sh b/tools/test/stress2/misc/nfs6.sh index 98b2a9d40945..0a70893e20ae 100755 --- a/tools/test/stress2/misc/nfs6.sh +++ b/tools/test/stress2/misc/nfs6.sh @@ -45,9 +45,8 @@ mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/stressX chmod 777 $mntpoint/stressX @@ -66,7 +65,7 @@ sleep 60 for i in `jot 10`; do umount -f $mntpoint > /dev/null 2>&1 sleep 1 - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint sleep 1 done diff --git a/tools/test/stress2/misc/nullfs10.sh b/tools/test/stress2/misc/nullfs10.sh index 4444bcca2913..c0574be42e5a 100755 --- a/tools/test/stress2/misc/nullfs10.sh +++ b/tools/test/stress2/misc/nullfs10.sh @@ -45,9 +45,8 @@ mount | grep -q $mnt2 && umount $mnt2 mount | grep $mnt2 | grep -q /dev/md && umount -f $mnt2 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mount -t nullfs $mntpoint $mnt2 diff --git a/tools/test/stress2/misc/nullfs11.sh b/tools/test/stress2/misc/nullfs11.sh index 9d02abd3b3ca..7685f607a3ea 100755 --- a/tools/test/stress2/misc/nullfs11.sh +++ b/tools/test/stress2/misc/nullfs11.sh @@ -48,9 +48,8 @@ test() { mount | grep -wq $mp1 && umount $mp1 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 $newfs_flags md${mdstart}$part > /dev/null - mount /dev/md${mdstart}$part $mp1 + newfs $newfs_flags md$mdstart > /dev/null + mount /dev/md$mdstart $mp1 mount -t nullfs $opt $mp1 $mp2 diff --git a/tools/test/stress2/misc/nullfs12.sh b/tools/test/stress2/misc/nullfs12.sh index 12671bb695c1..daec7c0ba04e 100755 --- a/tools/test/stress2/misc/nullfs12.sh +++ b/tools/test/stress2/misc/nullfs12.sh @@ -41,9 +41,8 @@ mount | grep -q $mnt2 && umount $mnt2 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mount -t nullfs $mntpoint $mnt2 diff --git a/tools/test/stress2/misc/nullfs13.sh b/tools/test/stress2/misc/nullfs13.sh index 5c51621a8c94..0ef9b0f597fd 100755 --- a/tools/test/stress2/misc/nullfs13.sh +++ b/tools/test/stress2/misc/nullfs13.sh @@ -41,9 +41,8 @@ mount | grep -q "$nullfsmp " && umount $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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mount -t nullfs $mntpoint $nullfsmp diff --git a/tools/test/stress2/misc/nullfs14.sh b/tools/test/stress2/misc/nullfs14.sh index 96bcb470dc40..4c38bef54896 100755 --- a/tools/test/stress2/misc/nullfs14.sh +++ b/tools/test/stress2/misc/nullfs14.sh @@ -39,9 +39,8 @@ mount | grep -q "$nullfsmp " && umount $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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint #chmod 777 $mntpoint mount -t nullfs $mntpoint $nullfsmp diff --git a/tools/test/stress2/misc/nullfs15.sh b/tools/test/stress2/misc/nullfs15.sh index fcaca4af8cb9..0cd589173456 100755 --- a/tools/test/stress2/misc/nullfs15.sh +++ b/tools/test/stress2/misc/nullfs15.sh @@ -40,9 +40,8 @@ mount | grep -q "$nullfsmp " && umount $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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mount -t nullfs $mntpoint $nullfsmp mkdir $mntpoint/.new_packages $nullfsmp/new_packages diff --git a/tools/test/stress2/misc/nullfs18.sh b/tools/test/stress2/misc/nullfs18.sh index 1f3320bff1e6..0ee0a1c2ef6b 100755 --- a/tools/test/stress2/misc/nullfs18.sh +++ b/tools/test/stress2/misc/nullfs18.sh @@ -39,11 +39,10 @@ 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 +newfs -n md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / N)) diff --git a/tools/test/stress2/misc/nullfs19.sh b/tools/test/stress2/misc/nullfs19.sh index fd5f16f4b780..6ad70077b7b3 100755 --- a/tools/test/stress2/misc/nullfs19.sh +++ b/tools/test/stress2/misc/nullfs19.sh @@ -38,11 +38,10 @@ 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 $newfs_flags md${mdstart}$part > /dev/null +newfs -n $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / N)) diff --git a/tools/test/stress2/misc/nullfs20.sh b/tools/test/stress2/misc/nullfs20.sh index 78c5295bae32..9e22770b139b 100755 --- a/tools/test/stress2/misc/nullfs20.sh +++ b/tools/test/stress2/misc/nullfs20.sh @@ -37,11 +37,10 @@ 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 -bsdlabel -w md$mdstart auto -newfs -n -b 4096 -f 512 -i 1024 md${mdstart}$part > /dev/null +newfs -n -b 4096 -f 512 -i 1024 md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mp2=$mntpoint$((mdstart + 1)) diff --git a/tools/test/stress2/misc/nullfs21.sh b/tools/test/stress2/misc/nullfs21.sh index 209ed65d1d3f..9184cbdaa088 100755 --- a/tools/test/stress2/misc/nullfs21.sh +++ b/tools/test/stress2/misc/nullfs21.sh @@ -37,11 +37,10 @@ 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 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -n -b 4096 -f 512 -i 1024 md${mdstart}$part > /dev/null +newfs -n -b 4096 -f 512 -i 1024 md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint mp2=${mntpoint}2 [ -d $mp2 ] || mkdir -p $mp2 diff --git a/tools/test/stress2/misc/nullfs22.sh b/tools/test/stress2/misc/nullfs22.sh index 12d1c16cd9a3..f5fadd7ed9d0 100755 --- a/tools/test/stress2/misc/nullfs22.sh +++ b/tools/test/stress2/misc/nullfs22.sh @@ -45,9 +45,8 @@ mount | grep -q "on $mp2 " && umount $mp2 mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mount -t nullfs $mntpoint $mp2 diff --git a/tools/test/stress2/misc/nullfs25.sh b/tools/test/stress2/misc/nullfs25.sh index 5588567ead22..57f63c6d2330 100755 --- a/tools/test/stress2/misc/nullfs25.sh +++ b/tools/test/stress2/misc/nullfs25.sh @@ -40,9 +40,8 @@ CONT=/tmp/nullfs25.continue 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint (cd $mntpoint; jot 500 | xargs touch) (cd ../testcases/swap; ./swap -t 5m -i 20 > /dev/null) & diff --git a/tools/test/stress2/misc/nullfs27.sh b/tools/test/stress2/misc/nullfs27.sh index 02894fba5efb..907e9de14253 100755 --- a/tools/test/stress2/misc/nullfs27.sh +++ b/tools/test/stress2/misc/nullfs27.sh @@ -39,10 +39,9 @@ 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 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mp2=${mntpoint}2 diff --git a/tools/test/stress2/misc/nullfs7.sh b/tools/test/stress2/misc/nullfs7.sh index 329258f5af4d..d790f7ef05b0 100755 --- a/tools/test/stress2/misc/nullfs7.sh +++ b/tools/test/stress2/misc/nullfs7.sh @@ -43,9 +43,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint [ -d $RUNDIR ] || mkdir -p $RUNDIR for i in `jot 50`; do diff --git a/tools/test/stress2/misc/nullfs9.sh b/tools/test/stress2/misc/nullfs9.sh index e74cde947924..7e7403af3138 100755 --- a/tools/test/stress2/misc/nullfs9.sh +++ b/tools/test/stress2/misc/nullfs9.sh @@ -41,9 +41,8 @@ mount | grep -q $mnt2/mp && umount $mnt2/mp mount | grep $mnt2 | grep -q /dev/md && umount -f $mnt2 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 $mnt2 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mnt2 chmod 777 $mnt2 mount | grep $mntpoint | grep -q tmpfs && umount -f $mntpoint diff --git a/tools/test/stress2/misc/overcommit.sh b/tools/test/stress2/misc/overcommit.sh index 40f60a32f4af..319cd1ee2192 100755 --- a/tools/test/stress2/misc/overcommit.sh +++ b/tools/test/stress2/misc/overcommit.sh @@ -44,9 +44,8 @@ sysctl vm.overcommit=1 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=10m diff --git a/tools/test/stress2/misc/overcommit2.sh b/tools/test/stress2/misc/overcommit2.sh index aed26689b933..962fc01e8e50 100755 --- a/tools/test/stress2/misc/overcommit2.sh +++ b/tools/test/stress2/misc/overcommit2.sh @@ -46,9 +46,8 @@ trap "sysctl vm.overcommit=$old" EXIT INT 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 ${size}m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint echo "Expect: /mnt: write failed, filesystem is full diff --git a/tools/test/stress2/misc/overlap.sh b/tools/test/stress2/misc/overlap.sh index f7ac00116559..e1de3e914491 100755 --- a/tools/test/stress2/misc/overlap.sh +++ b/tools/test/stress2/misc/overlap.sh @@ -45,11 +45,10 @@ rm -f /tmp/overlap.c size="1g" mdconfig -a -t swap -s $size -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -U md${mdstart}$part > /dev/null +newfs -U md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint (cd $mntpoint; /tmp/overlap) diff --git a/tools/test/stress2/misc/pageout.sh b/tools/test/stress2/misc/pageout.sh index 5497a1135ff4..eafeb22d3417 100755 --- a/tools/test/stress2/misc/pageout.sh +++ b/tools/test/stress2/misc/pageout.sh @@ -48,11 +48,10 @@ 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 $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint f1=$mntpoint/f1 diff --git a/tools/test/stress2/misc/parallelmount.sh b/tools/test/stress2/misc/parallelmount.sh index 5292efbed97a..6d6a5c458328 100755 --- a/tools/test/stress2/misc/parallelmount.sh +++ b/tools/test/stress2/misc/parallelmount.sh @@ -38,8 +38,7 @@ parallel=40 if [ $# -eq 0 ]; then [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 10m -u $mdstart || exit 1 - bsdlabel -w md$mdstart auto - newfs $newfs_flags md${mdstart}$part > /dev/null + newfs $newfs_flags md$mdstart > /dev/null # start the parallel tests for i in `jot $parallel`; do @@ -61,7 +60,7 @@ if [ $# -eq 0 ]; then else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 600 ]; do - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint umount $mntpoint mount done > /dev/null 2>&1 diff --git a/tools/test/stress2/misc/parallelmount2.sh b/tools/test/stress2/misc/parallelmount2.sh index 454a7b4b01ed..a90ae65aa8fd 100755 --- a/tools/test/stress2/misc/parallelmount2.sh +++ b/tools/test/stress2/misc/parallelmount2.sh @@ -41,11 +41,10 @@ parallel=40 if [ $# -eq 0 ]; then [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 10m -u $mdstart || exit 1 - bsdlabel -w md$mdstart auto - newfs $newfs_flags md${mdstart}$part > /dev/null + newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/var/tmp/fstab.$$ - echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB - mount /dev/md${mdstart}$part $mntpoint + echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB + mount /dev/md$mdstart $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export QK=$(($1 / 10 * 8)) export QI=$(($2 / 10 * 8)) @@ -76,7 +75,7 @@ if [ $# -eq 0 ]; then else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 600 ]; do - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint quotaon $mntpoint umount $mntpoint mount diff --git a/tools/test/stress2/misc/pcatch.sh b/tools/test/stress2/misc/pcatch.sh index f1db7de253f2..6a4ebc34e00a 100755 --- a/tools/test/stress2/misc/pcatch.sh +++ b/tools/test/stress2/misc/pcatch.sh @@ -52,10 +52,9 @@ cd $here 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 +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 120 ]; do diff --git a/tools/test/stress2/misc/pfl.sh b/tools/test/stress2/misc/pfl.sh index 6d590b5cf225..d4f435c5f34c 100755 --- a/tools/test/stress2/misc/pfl.sh +++ b/tools/test/stress2/misc/pfl.sh @@ -56,17 +56,15 @@ opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-j" || echo "-U") mount | grep "on $mp1 " | grep -q /dev/md && umount -f $mp1 [ -c /dev/md$md1 ] && mdconfig -d -u $md1 mdconfig -a -t swap -s ${size}m -u $md1 -bsdlabel -w md$md1 auto -newfs $opt md${md1}$part > /dev/null -mount /dev/md${md1}$part $mp1 +newfs $opt md${md1} > /dev/null +mount /dev/md${md1} $mp1 chmod 777 $mp1 mount | grep "on $mp2 " | grep -q /dev/md && umount -f $mp2 [ -c /dev/md$md2 ] && mdconfig -d -u $md2 mdconfig -a -t swap -s ${size}m -u $md2 -bsdlabel -w md$md2 auto -newfs $opt md${md2}$part > /dev/null -mount /dev/md${md2}$part $mp2 +newfs $opt md${md2} > /dev/null +mount /dev/md${md2} $mp2 chmod 777 $mp2 su $testuser -c "cd $mp1; /tmp/pfl" & diff --git a/tools/test/stress2/misc/pfl2.sh b/tools/test/stress2/misc/pfl2.sh index 9b6497294242..458962b65f2b 100755 --- a/tools/test/stress2/misc/pfl2.sh +++ b/tools/test/stress2/misc/pfl2.sh @@ -54,17 +54,15 @@ opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-j" || echo "-U") mount | grep "on $mp1 " | grep -q /dev/md && umount -f $mp1 mdconfig -l | grep -q md$md1 && mdconfig -d -u $md1 mdconfig -a -t swap -s ${size}m -u $md1 -bsdlabel -w md$md1 auto -newfs $opt md${md1}$part > /dev/null -mount /dev/md${md1}$part $mp1 +newfs $opt md${md1} > /dev/null +mount /dev/md${md1} $mp1 chmod 777 $mp1 mount | grep "on $mp2 " | grep -q /dev/md && umount -f $mp2 mdconfig -l | grep -q md$md2 && mdconfig -d -u $md2 mdconfig -a -t swap -s ${size}m -u $md2 -bsdlabel -w md$md2 auto -newfs $opt md${md2}$part > /dev/null -mount /dev/md${md2}$part $mp2 +newfs $opt md${md2} > /dev/null +mount /dev/md${md2} $mp2 chmod 777 $mp2 export runRUNTIME=10m diff --git a/tools/test/stress2/misc/pfl4.sh b/tools/test/stress2/misc/pfl4.sh index 38520a983d33..3459923f5795 100755 --- a/tools/test/stress2/misc/pfl4.sh +++ b/tools/test/stress2/misc/pfl4.sh @@ -63,9 +63,8 @@ for i in `jot $mounts $start`; do mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint 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 + newfs $newfs_flags md$mdstart > /dev/null + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX @@ -90,7 +89,7 @@ for i in `jot $mounts $start`; do n=$((n += 1)) [ $n -gt 60 ] && exit 1 done - checkfs /dev/md${mdstart}$part || s=$? + checkfs /dev/md$mdstart || s=$? mdconfig -d -u $mdstart done exit $s diff --git a/tools/test/stress2/misc/pread.sh b/tools/test/stress2/misc/pread.sh index fecdc18675c9..1bf3b874e6af 100755 --- a/tools/test/stress2/misc/pread.sh +++ b/tools/test/stress2/misc/pread.sh @@ -70,9 +70,8 @@ while mount | grep -q "on $mntpoint "; do done 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cp -a /usr/include $mntpoint echo "Testing FFS" /tmp/pread $mntpoint diff --git a/tools/test/stress2/misc/quota1.sh b/tools/test/stress2/misc/quota1.sh index 38e0fcd9c351..2bdb16c2a624 100755 --- a/tools/test/stress2/misc/quota1.sh +++ b/tools/test/stress2/misc/quota1.sh @@ -38,14 +38,13 @@ D=$diskimage trap "rm -f $D" 0 dd if=/dev/zero of=$D bs=1m count=128 status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes (cd ..; ./run.sh disk.cfg) diff --git a/tools/test/stress2/misc/quota10.sh b/tools/test/stress2/misc/quota10.sh index 1452f68538cf..44d417ab3d33 100755 --- a/tools/test/stress2/misc/quota10.sh +++ b/tools/test/stress2/misc/quota10.sh @@ -51,9 +51,8 @@ if [ $# -eq 0 ]; then dd if=/dev/zero of=$D$m bs=1m count=1 status=none mdconfig -a -t vnode -f $D$m -u $m - bsdlabel -w md$m auto - newfs md${m}$part > /dev/null 2>&1 - echo "/dev/md${m}$part ${mntpoint}$m ufs rw,userquota 2 2" \ + newfs md${m} > /dev/null 2>&1 + echo "/dev/md${m} ${mntpoint}$m ufs rw,userquota 2 2" \ >> $PATH_FSTAB mount ${mntpoint}$m edquota -u -f ${mntpoint}$m -e \ @@ -92,7 +91,7 @@ else while [ $((`date '+%s'` - start)) -lt 1200 ]; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` - mount $opt /dev/md${m}$part ${mntpoint}$m + mount $opt /dev/md${m} ${mntpoint}$m while mount | grep -qw $mntpoint$m; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") diff --git a/tools/test/stress2/misc/quota11.sh b/tools/test/stress2/misc/quota11.sh index bf08f9e15db4..62fcbe7f0922 100755 --- a/tools/test/stress2/misc/quota11.sh +++ b/tools/test/stress2/misc/quota11.sh @@ -37,15 +37,14 @@ . ../default.cfg -mount | grep "on $mntpoint " | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "on $mntpoint " | grep -q md$mdstart && umount $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 +newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab trap "rm -f $PATH_FSTAB" 0 -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint edquota -u -f $mntpoint -e $mntpoint:1000:2000:100:200 root quotaon $mntpoint diff --git a/tools/test/stress2/misc/quota12.sh b/tools/test/stress2/misc/quota12.sh index 78a5e0c0cd81..2b2094f22460 100755 --- a/tools/test/stress2/misc/quota12.sh +++ b/tools/test/stress2/misc/quota12.sh @@ -37,15 +37,14 @@ . ../default.cfg -mount | grep "on $mntpoint " | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab trap "rm -f $PATH_FSTAB" 0 -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$1 diff --git a/tools/test/stress2/misc/quota2.sh b/tools/test/stress2/misc/quota2.sh index 9deb97726d60..3b346ef969d2 100755 --- a/tools/test/stress2/misc/quota2.sh +++ b/tools/test/stress2/misc/quota2.sh @@ -36,13 +36,12 @@ export PATH_FSTAB=/tmp/fstab trap "rm -f $D $PATH_FSTAB" 0 dd if=/dev/zero of=$D bs=1m count=128 status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +newfs $newfs_flags md$mdstart > /dev/null +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint edquota -u -f $mntpoint -e $mntpoint:100000:110000:15000:16000 root quotacheck $mntpoint diff --git a/tools/test/stress2/misc/quota3.sh b/tools/test/stress2/misc/quota3.sh index de4c60ec2810..9260178b39fa 100755 --- a/tools/test/stress2/misc/quota3.sh +++ b/tools/test/stress2/misc/quota3.sh @@ -36,13 +36,12 @@ export PATH_FSTAB=/tmp/fstab trap "rm -f $D $PATH_FSTAB" 0 dd if=/dev/zero of=$D bs=1m count=1k status=none || exit 1 -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +newfs $newfs_flags md$mdstart > /dev/null +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint edquota -u -f $mntpoint -e $mntpoint:850000:900000:130000:140000 root quotacheck $mntpoint diff --git a/tools/test/stress2/misc/quota4.sh b/tools/test/stress2/misc/quota4.sh index 3eeae263cac2..8acac9958f1b 100755 --- a/tools/test/stress2/misc/quota4.sh +++ b/tools/test/stress2/misc/quota4.sh @@ -38,20 +38,19 @@ D=$diskimage trap "rm -f $D" 0 dd if=/dev/zero of=$D bs=1m count=1k status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount \ +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount \ $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" >> \ +newfs $newfs_flags md$mdstart > /dev/null +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" >> \ /etc/fstab mount $mntpoint edquota -u -f $mntpoint -e ${mntpoint}:850000:900000:130000:140000 root \ > /dev/null 2>&1 quotaon $mntpoint -sed -i -e "/md${mdstart}$part/d" /etc/fstab # clean up before any panics +sed -i -e "/md$mdstart/d" /etc/fstab # clean up before any panics export RUNDIR=$mntpoint/stressX ../testcases/rw/rw -t 2m -i 200 -h -n 2>/dev/null & sleep 60 diff --git a/tools/test/stress2/misc/quota6.sh b/tools/test/stress2/misc/quota6.sh index 9cb3f5187f65..05a839adb395 100755 --- a/tools/test/stress2/misc/quota6.sh +++ b/tools/test/stress2/misc/quota6.sh @@ -36,14 +36,13 @@ D=$diskimage truncate -s 250M $D -mount | grep $mntpoint | grep -q md${mdstart}$part && umount $mntpoint +mount | grep $mntpoint | grep -q md$mdstart && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > \ +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > \ $PATH_FSTAB mount $mntpoint edquota -u -f $mntpoint -e $mntpoint:850000:900000:130000:140000 root > \ diff --git a/tools/test/stress2/misc/quota7.sh b/tools/test/stress2/misc/quota7.sh index f098fceb0939..2e2fe6b7a52d 100755 --- a/tools/test/stress2/misc/quota7.sh +++ b/tools/test/stress2/misc/quota7.sh @@ -42,10 +42,9 @@ mount | grep $mntpoint | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 21)) diff --git a/tools/test/stress2/misc/quota8.sh b/tools/test/stress2/misc/quota8.sh index a11418aba5d9..148c2d19ce65 100755 --- a/tools/test/stress2/misc/quota8.sh +++ b/tools/test/stress2/misc/quota8.sh @@ -47,9 +47,8 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" >> \ +newfs $newfs_flags md$mdstart > /dev/null +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" >> \ /etc/fstab mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` @@ -63,7 +62,7 @@ export QI=$((INODES / 2)) edquota -u -f $mntpoint -e ${mntpoint}:$((QK - 50)):$QK:$((QI - 50 )):$QI \ $testuser quotaon $mntpoint -sed -i -e "/md${mdstart}$part/d" /etc/fstab +sed -i -e "/md$mdstart/d" /etc/fstab export RUNDIR=$mntpoint/stressX mkdir $mntpoint/stressX chmod 777 $mntpoint/stressX diff --git a/tools/test/stress2/misc/quota9.sh b/tools/test/stress2/misc/quota9.sh index 01681bce8a01..1baf4b7b0267 100755 --- a/tools/test/stress2/misc/quota9.sh +++ b/tools/test/stress2/misc/quota9.sh @@ -54,10 +54,9 @@ mount | grep "$mntpoint" | grep -q md$mdstart && [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" \ +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" \ > $PATH_FSTAB mount $mntpoint mkdir $mntpoint/stressX diff --git a/tools/test/stress2/misc/readdir.sh b/tools/test/stress2/misc/readdir.sh index 16523982d859..8616a8a40206 100755 --- a/tools/test/stress2/misc/readdir.sh +++ b/tools/test/stress2/misc/readdir.sh @@ -71,9 +71,8 @@ if ping -c 2 `echo $nfs_export | sed 's/:.*//'` > /dev/null 2>&1; then fi mdconfig -a -t swap -s 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cp -a /usr/include $mntpoint echo "Testing UFS" /tmp/readdir $mntpoint @@ -81,9 +80,8 @@ umount $mntpoint 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cp -a /usr/include $mntpoint echo "Testing FFS" /tmp/readdir $mntpoint diff --git a/tools/test/stress2/misc/recursiveflushes.sh b/tools/test/stress2/misc/recursiveflushes.sh index 1da843a2f1d1..7e6e8a7236a6 100755 --- a/tools/test/stress2/misc/recursiveflushes.sh +++ b/tools/test/stress2/misc/recursiveflushes.sh @@ -42,9 +42,8 @@ snap() { 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 4g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint old=`sysctl vfs.recursiveflushes | awk '{print $NF}'` cd $mntpoint diff --git a/tools/test/stress2/misc/rename10.sh b/tools/test/stress2/misc/rename10.sh index 5cbf39f3d3d2..8a76ba4ed05b 100755 --- a/tools/test/stress2/misc/rename10.sh +++ b/tools/test/stress2/misc/rename10.sh @@ -45,9 +45,8 @@ 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 4g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint avail=`df -k $mntpoint | tail -1 | awk '{print $4}'` cd $mntpoint @@ -72,7 +71,7 @@ while mount | grep "on $mntpoint " | grep -q /dev/md; do [ $n -gt 5 ] && { umount -f $mntpoint; break; } done -checkfs /dev/md${mdstart}$part || s=$? +checkfs /dev/md$mdstart || s=$? rm -f /tmp/rename10 mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/rename11.sh b/tools/test/stress2/misc/rename11.sh index 19aaa16f92ea..bae0c31c376f 100755 --- a/tools/test/stress2/misc/rename11.sh +++ b/tools/test/stress2/misc/rename11.sh @@ -42,12 +42,11 @@ 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 [ $# -eq 1 ] && newfs_flags=$1 # Problem only seen with SU -echo newfs $newfs_flags md${mdstart}$part -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +echo newfs $newfs_flags md$mdstart +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/dir ( @@ -59,7 +58,7 @@ while mount | grep "on $mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart rm -rf /tmp/rename11 exit $s diff --git a/tools/test/stress2/misc/rename12.sh b/tools/test/stress2/misc/rename12.sh index 3000e59b70d3..0f15c7e543d3 100755 --- a/tools/test/stress2/misc/rename12.sh +++ b/tools/test/stress2/misc/rename12.sh @@ -45,9 +45,8 @@ 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 4g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint inodes=`df -i $mntpoint | tail -1 | awk '{print $7}'` loops=4 @@ -72,7 +71,7 @@ while mount | grep "on $mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart rm -rf /tmp/rename12 exit $s diff --git a/tools/test/stress2/misc/rename13.sh b/tools/test/stress2/misc/rename13.sh index 9234d4454751..7184c82cbf78 100755 --- a/tools/test/stress2/misc/rename13.sh +++ b/tools/test/stress2/misc/rename13.sh @@ -41,9 +41,8 @@ mount | grep -q "on $mntpoint " && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint s=0 to=/tmp/rename13.dir diff --git a/tools/test/stress2/misc/rename5.sh b/tools/test/stress2/misc/rename5.sh index 89779b79ec32..9a83bf85e2c0 100755 --- a/tools/test/stress2/misc/rename5.sh +++ b/tools/test/stress2/misc/rename5.sh @@ -41,10 +41,9 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint here=`pwd` cd /tmp @@ -59,11 +58,11 @@ cd $mntpoint cd $here rm -f /tmp/rename5 -while mount | grep -q md${mdstart}$part; do +while mount | grep -q md$mdstart; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/rename6.sh b/tools/test/stress2/misc/rename6.sh index 6c27c5601d2a..b08a0851266e 100755 --- a/tools/test/stress2/misc/rename6.sh +++ b/tools/test/stress2/misc/rename6.sh @@ -44,14 +44,13 @@ cd $here 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "cd $mntpoint; /tmp/rename6" -while mount | grep -q md${mdstart}$part; do +while mount | grep -q md$mdstart; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/rename7.sh b/tools/test/stress2/misc/rename7.sh index 89edcd17e827..9f6954916411 100755 --- a/tools/test/stress2/misc/rename7.sh +++ b/tools/test/stress2/misc/rename7.sh @@ -46,18 +46,17 @@ cd $here 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "cd $mntpoint; /tmp/rename7 || echo FAIL" for i in `jot 10`; do - mount | grep -q md${mdstart}$part && \ + mount | grep -q md$mdstart && \ umount $mntpoint && mdconfig -d -u $mdstart && break done -if mount | grep -q md${mdstart}$part; then +if mount | grep -q md$mdstart; then echo "Test failed" exit 1 fi diff --git a/tools/test/stress2/misc/rename8.sh b/tools/test/stress2/misc/rename8.sh index e0019cb353fa..990b8e96c941 100755 --- a/tools/test/stress2/misc/rename8.sh +++ b/tools/test/stress2/misc/rename8.sh @@ -44,20 +44,19 @@ cd $here 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "cd $mntpoint; mkdir r; /tmp/rename8 r" ls -li $mntpoint/r | egrep -v "^total" for i in `jot 10`; do - mount | grep -q md${mdstart}$part && \ + mount | grep -q md$mdstart && \ umount $mntpoint && mdconfig -d -u $mdstart && break sleep 1 done -if mount | grep -q md${mdstart}$part; then +if mount | grep -q md$mdstart; then fuser $mntpoint echo "umount $mntpoint failed" exit 1 diff --git a/tools/test/stress2/misc/rename9.sh b/tools/test/stress2/misc/rename9.sh index e169c64af5ea..67f5de37b70f 100755 --- a/tools/test/stress2/misc/rename9.sh +++ b/tools/test/stress2/misc/rename9.sh @@ -42,9 +42,8 @@ cd $here 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint rm -rf $mntpoint/.snap chmod 777 $mntpoint @@ -54,7 +53,7 @@ kill $! > /dev/null 2>&1 wait ls -ilR $mntpoint | egrep -v "^total " -while mount | grep -q md${mdstart}$part; do +while mount | grep -q md$mdstart; do umount $mntpoint || sleep 1 done mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/rot.sh b/tools/test/stress2/misc/rot.sh index b658f35aad1b..3254562fad13 100755 --- a/tools/test/stress2/misc/rot.sh +++ b/tools/test/stress2/misc/rot.sh @@ -44,11 +44,10 @@ 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 $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint (cd $mntpoint; /tmp/rot) diff --git a/tools/test/stress2/misc/routetbl.sh b/tools/test/stress2/misc/routetbl.sh index 0a2b936f15e4..df4fd64409eb 100755 --- a/tools/test/stress2/misc/routetbl.sh +++ b/tools/test/stress2/misc/routetbl.sh @@ -37,14 +37,13 @@ pgrep -q mountd || exit 0 mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 128m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null routetbl=`vmstat -m | grep routetbl | awk '{print $2}'` s=0 start=`date +%s` while [ $((`date +%s` - start)) -lt 60 ]; do - mount /dev/md${mdstart}$part $mntpoint && + mount /dev/md$mdstart $mntpoint && umount $mntpoint done routetbl=$((`vmstat -m | grep routetbl | awk '{print $2}'` - routetbl)) diff --git a/tools/test/stress2/misc/rw.sh b/tools/test/stress2/misc/rw.sh index 2cba9587c925..3f7f83df49db 100755 --- a/tools/test/stress2/misc/rw.sh +++ b/tools/test/stress2/misc/rw.sh @@ -40,11 +40,10 @@ mount | grep "on $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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=10m diff --git a/tools/test/stress2/misc/sched.sh b/tools/test/stress2/misc/sched.sh index f91055b3c289..1a1db70eb38a 100755 --- a/tools/test/stress2/misc/sched.sh +++ b/tools/test/stress2/misc/sched.sh @@ -43,9 +43,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint cpus=`sysctl hw.ncpu | sed 's/.*: //'` diff --git a/tools/test/stress2/misc/sendfile10.sh b/tools/test/stress2/misc/sendfile10.sh index df94c0f78ace..2e7c142b6bdf 100755 --- a/tools/test/stress2/misc/sendfile10.sh +++ b/tools/test/stress2/misc/sendfile10.sh @@ -44,9 +44,8 @@ cd $odir mount | grep "on $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 -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint dd if=/dev/random of=template bs=1m count=50 status=none diff --git a/tools/test/stress2/misc/sendfile13.sh b/tools/test/stress2/misc/sendfile13.sh index a6ae138a1fd0..cec938ba2b2c 100755 --- a/tools/test/stress2/misc/sendfile13.sh +++ b/tools/test/stress2/misc/sendfile13.sh @@ -57,9 +57,8 @@ md1=$mdstart mount | grep "on $mp1 " | grep -q /dev/md && umount -f $mp1 [ -c /dev/md$md1 ] && mdconfig -d -u $md1 mdconfig -a -t swap -s $size -u $md1 -bsdlabel -w md$md1 auto -newfs $newfs_flags -n md${md1}$part > /dev/null 2>&1 -mount /dev/md${md1}$part $mp1 +newfs $newfs_flags -n md${md1} > /dev/null 2>&1 +mount /dev/md${md1} $mp1 md2=$((mdstart + 1)) mp2=${mntpoint}$md2 @@ -67,9 +66,8 @@ mkdir -p $mp2 mount | grep "on $mp2 " | grep -q /dev/md && umount -f $mp2 [ -c /dev/md$md2 ] && mdconfig -d -u $md2 mdconfig -a -t swap -s $size -u $md2 -bsdlabel -w md$md2 auto -newfs $newfs_flags -n md${md2}$part > /dev/null 2>&1 -mount /dev/md${md2}$part $mp2 +newfs $newfs_flags -n md${md2} > /dev/null 2>&1 +mount /dev/md${md2} $mp2 set +e free=`df $mp1 | tail -1 | awk '{print $4}'` @@ -99,8 +97,8 @@ for i in `jot 6`; do [ $i -eq 6 ] && { echo FATAL; fstat -mf $mp2; exit 1; } done -checkfs /dev/md${md1}$part || s=1 -checkfs /dev/md${md2}$part || s=1 +checkfs /dev/md${md1} || s=1 +checkfs /dev/md${md2} || s=1 mdconfig -d -u $md1 || s=1 mdconfig -d -u $md2 || s=1 @@ -110,7 +108,7 @@ for i in `jot 6`; do [ $i -eq 6 ] && { echo FATAL; fstat -mf $mp2; exit 1; } done -checkfs /dev/md${md2}$part || s=1 +checkfs /dev/md${md2} || s=1 rm -rf $dir/sendfile13 exit $s diff --git a/tools/test/stress2/misc/sendfile14.sh b/tools/test/stress2/misc/sendfile14.sh index 0c8b64050423..bebc0b165615 100755 --- a/tools/test/stress2/misc/sendfile14.sh +++ b/tools/test/stress2/misc/sendfile14.sh @@ -57,9 +57,8 @@ md1=$mdstart mount | grep "on $mp1 " | grep -q /dev/md && umount -f $mp1 [ -c /dev/md$md1 ] && mdconfig -d -u $md1 mdconfig -a -t swap -s $size -u $md1 -bsdlabel -w md$md1 auto -newfs $newfs_flags -n md${md1}$part > /dev/null 2>&1 -mount /dev/md${md1}$part $mp1 +newfs $newfs_flags -n md${md1} > /dev/null 2>&1 +mount /dev/md${md1} $mp1 md2=$((mdstart + 1)) mp2=${mntpoint}$md2 @@ -67,9 +66,8 @@ mkdir -p $mp2 mount | grep "on $mp2 " | grep -q /dev/md && umount -f $mp2 [ -c /dev/md$md2 ] && mdconfig -d -u $md2 mdconfig -a -t swap -s $size -u $md2 -bsdlabel -w md$md2 auto -newfs $newfs_flags -n md${md2}$part > /dev/null 2>&1 -mount /dev/md${md2}$part $mp2 +newfs $newfs_flags -n md${md2} > /dev/null 2>&1 +mount /dev/md${md2} $mp2 set +e free=`df $mp1 | tail -1 | awk '{print $4}'` @@ -95,8 +93,8 @@ for i in `jot 6`; do [ $i -eq 6 ] && { echo FATAL; fstat -mf $mp2; exit 1; } done -checkfs /dev/md${md1}$part || s=1 -checkfs /dev/md${md2}$part || s=1 +checkfs /dev/md${md1} || s=1 +checkfs /dev/md${md2} || s=1 mdconfig -d -u $md1 || s=1 mdconfig -d -u $md2 || s=1 diff --git a/tools/test/stress2/misc/sendfile15.sh b/tools/test/stress2/misc/sendfile15.sh index 373c49977157..90cbdd86ada6 100755 --- a/tools/test/stress2/misc/sendfile15.sh +++ b/tools/test/stress2/misc/sendfile15.sh @@ -54,9 +54,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/sendfile16.sh b/tools/test/stress2/misc/sendfile16.sh index 2374bd00fd46..8b96ad5c7f74 100755 --- a/tools/test/stress2/misc/sendfile16.sh +++ b/tools/test/stress2/misc/sendfile16.sh @@ -45,9 +45,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/sendfile17.sh b/tools/test/stress2/misc/sendfile17.sh index 8580778d5ae8..560cb6b83081 100755 --- a/tools/test/stress2/misc/sendfile17.sh +++ b/tools/test/stress2/misc/sendfile17.sh @@ -47,9 +47,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 3g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/sendfile21.sh b/tools/test/stress2/misc/sendfile21.sh index cd36410d9247..c50c0f0ccdab 100755 --- a/tools/test/stress2/misc/sendfile21.sh +++ b/tools/test/stress2/misc/sendfile21.sh @@ -61,7 +61,6 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto newfs $newfs_flags -n md$mdstart > /dev/null mount /dev/md$mdstart $mntpoint set +e diff --git a/tools/test/stress2/misc/sendfile22.sh b/tools/test/stress2/misc/sendfile22.sh index 73737fb3e352..d948d8c001b6 100755 --- a/tools/test/stress2/misc/sendfile22.sh +++ b/tools/test/stress2/misc/sendfile22.sh @@ -45,7 +45,6 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto newfs_flags="" newfs $newfs_flags -n md$mdstart > /dev/null mount /dev/md$mdstart $mntpoint diff --git a/tools/test/stress2/misc/sendfile23.sh b/tools/test/stress2/misc/sendfile23.sh index c5b77a685f1c..02c354cdf48e 100755 --- a/tools/test/stress2/misc/sendfile23.sh +++ b/tools/test/stress2/misc/sendfile23.sh @@ -44,7 +44,6 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto newfs $newfs_flags -n md$mdstart > /dev/null mount /dev/md$mdstart $mntpoint set +e diff --git a/tools/test/stress2/misc/sendfile5.sh b/tools/test/stress2/misc/sendfile5.sh index 5bae03441779..c81515003a13 100755 --- a/tools/test/stress2/misc/sendfile5.sh +++ b/tools/test/stress2/misc/sendfile5.sh @@ -59,9 +59,8 @@ umount $mntpoint [ $loaded ] && kldunload tmpfs.ko mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint echo "Testing FFS" cp $diskimage $mntpoint /tmp/sendfile5 $mntpoint/$file diff --git a/tools/test/stress2/misc/sendfile6.sh b/tools/test/stress2/misc/sendfile6.sh index dd130b43d401..424d5dc575e6 100755 --- a/tools/test/stress2/misc/sendfile6.sh +++ b/tools/test/stress2/misc/sendfile6.sh @@ -236,9 +236,8 @@ 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 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint dd if=/dev/random of=$mntpoint/data bs=123456 count=1 status=none ./sendfile6_server $mntpoint/data mysocket & diff --git a/tools/test/stress2/misc/sendfile8.sh b/tools/test/stress2/misc/sendfile8.sh index 094ae45ce9ba..84ad0bf25a07 100755 --- a/tools/test/stress2/misc/sendfile8.sh +++ b/tools/test/stress2/misc/sendfile8.sh @@ -44,9 +44,8 @@ cd $odir mount | grep "on $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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint dd if=/dev/random of=in bs=1m count=50 status=none diff --git a/tools/test/stress2/misc/sendfile9.sh b/tools/test/stress2/misc/sendfile9.sh index b3b301281803..7e091660701f 100755 --- a/tools/test/stress2/misc/sendfile9.sh +++ b/tools/test/stress2/misc/sendfile9.sh @@ -43,9 +43,8 @@ cd $odir mount | grep "on $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 -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint dd if=/dev/random of=in bs=1m count=50 status=none diff --git a/tools/test/stress2/misc/setuid.sh b/tools/test/stress2/misc/setuid.sh index 770c20366f7d..642b4f3111fc 100755 --- a/tools/test/stress2/misc/setuid.sh +++ b/tools/test/stress2/misc/setuid.sh @@ -48,9 +48,8 @@ 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 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint mkdir $mntpoint/root diff --git a/tools/test/stress2/misc/sigxcpu.sh b/tools/test/stress2/misc/sigxcpu.sh index 3d478fd19286..135b40ea98e9 100755 --- a/tools/test/stress2/misc/sigxcpu.sh +++ b/tools/test/stress2/misc/sigxcpu.sh @@ -44,11 +44,10 @@ 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 4g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=4m diff --git a/tools/test/stress2/misc/snap10.sh b/tools/test/stress2/misc/snap10.sh index 53fba0ee652d..69d5ddd0bfdc 100755 --- a/tools/test/stress2/misc/snap10.sh +++ b/tools/test/stress2/misc/snap10.sh @@ -40,9 +40,8 @@ log=/tmp/snap10.log mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint while ! mksnap_ffs $mntpoint $mntpoint/.snap/stress2; do :; done diff --git a/tools/test/stress2/misc/snap11.sh b/tools/test/stress2/misc/snap11.sh index f4e499d7deda..2458438deef1 100755 --- a/tools/test/stress2/misc/snap11.sh +++ b/tools/test/stress2/misc/snap11.sh @@ -45,9 +45,8 @@ log=/tmp/snap11.log mount | grep "on $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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint last=`tail -1 /var/log/messages | cut -c1-15` [ -z "$last" ] && last=dummy @@ -79,7 +78,7 @@ for i in `jot 6`; do umount $mntpoint && break || sleep 10 done [ $i -eq 6 ] && exit 1 -fsck -t ufs -y /dev/md${mdstart}$part > $log 2>&1 || s=1 +fsck -t ufs -y /dev/md$mdstart > $log 2>&1 || s=1 egrep -v "IS CLEAN" $log | grep -q "[A-Z]" $log || { cat $log; s=1; } mdconfig -d -u $mdstart rm -rf $log diff --git a/tools/test/stress2/misc/snap12.sh b/tools/test/stress2/misc/snap12.sh index 137e1930fa27..759b00be33d4 100755 --- a/tools/test/stress2/misc/snap12.sh +++ b/tools/test/stress2/misc/snap12.sh @@ -44,9 +44,8 @@ mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart [ -c /dev/md$m2 ] && mdconfig -d -u $m2 mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint touch $mntpoint/file rm -f $mntpoint/.snap/stress2 @@ -65,7 +64,7 @@ for i in `jot 6`; do umount $mntpoint && break || sleep 10 done [ $i -eq 6 ] && exit 1 -fsck -t ufs -y /dev/md${mdstart}$part > $log 2>&1 || s=5 +fsck -t ufs -y /dev/md$mdstart > $log 2>&1 || s=5 egrep -v "IS CLEAN" $log | grep -q "[A-Z]" $log || { cat $log; s=6; } mdconfig -d -u $mdstart rm -rf $log diff --git a/tools/test/stress2/misc/snap8.sh b/tools/test/stress2/misc/snap8.sh index ffe33593bc6e..6cc1371506c8 100755 --- a/tools/test/stress2/misc/snap8.sh +++ b/tools/test/stress2/misc/snap8.sh @@ -39,7 +39,7 @@ . ../default.cfg -mount | grep -q /dev/md${mdstart}$part && umount -f /dev/md${mdstart}$part +mount | grep -q /dev/md$mdstart && umount -f /dev/md${mdstart} mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart parallel=20 @@ -53,9 +53,8 @@ mx=$((`sysctl -n hw.physmem` / 1024 / 1024 / 1024 / 2)) truncate -s ${size}G $diskimage mdconfig -a -t vnode -f $diskimage -u $mdstart -bsdlabel -w md$mdstart auto -newfs -O2 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -O2 $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mycc -o /tmp/fstool -Wall ../tools/fstool.c for i in `jot $parallel`; do @@ -88,8 +87,8 @@ for i in `jot 10`; do done wait -umount /dev/md${mdstart}$part +umount /dev/md$mdstart -mount | grep -q /dev/md${mdstart}$part && umount -f /dev/md${mdstart}$part +mount | grep -q /dev/md$mdstart && umount -f /dev/md${mdstart} mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart rm -f $diskimage diff --git a/tools/test/stress2/misc/snap9.sh b/tools/test/stress2/misc/snap9.sh index d1ba0e968427..61fe464439e3 100755 --- a/tools/test/stress2/misc/snap9.sh +++ b/tools/test/stress2/misc/snap9.sh @@ -39,9 +39,8 @@ 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 $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint dd if=/dev/zero of=$mntpoint/big1 bs=1m count=512 status=none dd if=/dev/zero of=$mntpoint/big2 bs=1m count=512 status=none diff --git a/tools/test/stress2/misc/socketpair4.sh b/tools/test/stress2/misc/socketpair4.sh index c9bfd52a3bfc..65fb55d975ad 100755 --- a/tools/test/stress2/misc/socketpair4.sh +++ b/tools/test/stress2/misc/socketpair4.sh @@ -45,7 +45,6 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto newfs_flags="" newfs $newfs_flags -n md$mdstart > /dev/null mount /dev/md$mdstart $mntpoint diff --git a/tools/test/stress2/misc/sparse.sh b/tools/test/stress2/misc/sparse.sh index 1ae95de12558..8327177c92f9 100755 --- a/tools/test/stress2/misc/sparse.sh +++ b/tools/test/stress2/misc/sparse.sh @@ -35,9 +35,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e in=$mntpoint/in diff --git a/tools/test/stress2/misc/spin.sh b/tools/test/stress2/misc/spin.sh index 0128e3ff3529..070d08c2c33f 100755 --- a/tools/test/stress2/misc/spin.sh +++ b/tools/test/stress2/misc/spin.sh @@ -49,9 +49,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cpus=`sysctl hw.ncpu | sed 's/.*: //'` (cd $mntpoint; /tmp/spin $((cpus + 1))) & diff --git a/tools/test/stress2/misc/suj.sh b/tools/test/stress2/misc/suj.sh index 5beb93ec7388..2a5f04ddcd03 100755 --- a/tools/test/stress2/misc/suj.sh +++ b/tools/test/stress2/misc/suj.sh @@ -35,9 +35,8 @@ 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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX @@ -47,6 +46,6 @@ su $testuser -c "cd ..; ./run.sh rw.cfg" while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/suj11.sh b/tools/test/stress2/misc/suj11.sh index ccb97fa8d189..362d33caf8a4 100755 --- a/tools/test/stress2/misc/suj11.sh +++ b/tools/test/stress2/misc/suj11.sh @@ -36,11 +36,10 @@ 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 -j md${mdstart}$part > /dev/null +newfs -j md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=30m @@ -51,8 +50,8 @@ 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}$part; s=$? -tunefs -j disable /dev/md${mdstart}$part -checkfs /dev/md${mdstart}$part || s=$? +checkfs /dev/md$mdstart; s=$? +tunefs -j disable /dev/md$mdstart +checkfs /dev/md$mdstart || s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/suj13.sh b/tools/test/stress2/misc/suj13.sh index 7a5616488f21..a33af26e4772 100755 --- a/tools/test/stress2/misc/suj13.sh +++ b/tools/test/stress2/misc/suj13.sh @@ -40,11 +40,10 @@ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart size="128m" [ `uname -m` = "amd64" ] && size="1g" mdconfig -a -t malloc -o reserve -s $size -S 4096 -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -j md${mdstart}$part > /dev/null +newfs -j md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=20m @@ -55,6 +54,6 @@ 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}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/suj14.sh b/tools/test/stress2/misc/suj14.sh index 6587d4f554fd..7d83c454902b 100755 --- a/tools/test/stress2/misc/suj14.sh +++ b/tools/test/stress2/misc/suj14.sh @@ -38,11 +38,10 @@ 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 -j md${mdstart}$part > /dev/null +newfs -j md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint # Populate the FS with some random files for i in `jot 102`; do diff --git a/tools/test/stress2/misc/suj15.sh b/tools/test/stress2/misc/suj15.sh index 011cb0bebdf9..6ab9e653f12c 100755 --- a/tools/test/stress2/misc/suj15.sh +++ b/tools/test/stress2/misc/suj15.sh @@ -42,11 +42,10 @@ 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 -j md${mdstart}$part > /dev/null +newfs -j md$mdstart > /dev/null -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=30m @@ -56,7 +55,7 @@ su $testuser -c 'cd ..; ./run.sh jeff.cfg > /dev/null' & rpid=$! while kill -0 $rpid 2> /dev/null; do sleep 10 - dump -0aLf /dev/null /dev/md${mdstart}$part + dump -0aLf /dev/null /dev/md$mdstart done wait diff --git a/tools/test/stress2/misc/suj16.sh b/tools/test/stress2/misc/suj16.sh index 8eaf5d678534..b58f406e7564 100755 --- a/tools/test/stress2/misc/suj16.sh +++ b/tools/test/stress2/misc/suj16.sh @@ -40,11 +40,10 @@ 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 -j md${mdstart}$part > /dev/null 2>&1 +newfs -j md$mdstart > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=30m diff --git a/tools/test/stress2/misc/suj17.sh b/tools/test/stress2/misc/suj17.sh index 319b61ecab8b..d45d9a574778 100755 --- a/tools/test/stress2/misc/suj17.sh +++ b/tools/test/stress2/misc/suj17.sh @@ -45,12 +45,11 @@ 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 [ $# -eq 1 ] && opt="$1" [ $# -eq 0 ] && opt="-j" -echo "newfs $opt md${mdstart}$part" -newfs $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +echo "newfs $opt md$mdstart" +newfs $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "cd $mntpoint; /tmp/suj17" @@ -59,7 +58,7 @@ s=$? while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part || s=$? +checkfs /dev/md$mdstart || s=$? mdconfig -d -u $mdstart rm -f /tmp/suj17 exit $s diff --git a/tools/test/stress2/misc/suj18.sh b/tools/test/stress2/misc/suj18.sh index 120a8e53ab67..d2f4819f16b2 100755 --- a/tools/test/stress2/misc/suj18.sh +++ b/tools/test/stress2/misc/suj18.sh @@ -42,10 +42,9 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount $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 -j md${mdstart}$part > /dev/null +newfs -j md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > \ +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > \ $PATH_FSTAB mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` diff --git a/tools/test/stress2/misc/suj19.sh b/tools/test/stress2/misc/suj19.sh index 580ebf131700..751cacad0615 100755 --- a/tools/test/stress2/misc/suj19.sh +++ b/tools/test/stress2/misc/suj19.sh @@ -46,10 +46,9 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount $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 -j md${mdstart}$part > /dev/null +newfs -j md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export QK=$(($1 / 4)) diff --git a/tools/test/stress2/misc/suj2.sh b/tools/test/stress2/misc/suj2.sh index bc00f09d3045..ede32fcc674f 100755 --- a/tools/test/stress2/misc/suj2.sh +++ b/tools/test/stress2/misc/suj2.sh @@ -45,9 +45,8 @@ rm -f suj2.c 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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint rm -rf foo bar diff --git a/tools/test/stress2/misc/suj20.sh b/tools/test/stress2/misc/suj20.sh index 9e73a480f333..eaf9ffeb654a 100755 --- a/tools/test/stress2/misc/suj20.sh +++ b/tools/test/stress2/misc/suj20.sh @@ -67,9 +67,8 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount $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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint chmod 777 $mntpoint diff --git a/tools/test/stress2/misc/suj21.sh b/tools/test/stress2/misc/suj21.sh index cbf2d4c730ab..c8009b3c4a62 100755 --- a/tools/test/stress2/misc/suj21.sh +++ b/tools/test/stress2/misc/suj21.sh @@ -68,9 +68,8 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount $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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint chmod 777 $mntpoint diff --git a/tools/test/stress2/misc/suj22.sh b/tools/test/stress2/misc/suj22.sh index beff053378c1..e79a0bcd8a65 100755 --- a/tools/test/stress2/misc/suj22.sh +++ b/tools/test/stress2/misc/suj22.sh @@ -66,8 +66,8 @@ D=$diskimage if [ -n "`find $D -mtime -1h 2>/dev/null`" ]; then # FS left by previous crash mdconfig -a -t vnode -f $D -u $mdstart - fsck -t ufs -y md${mdstart}$part - fsck -t ufs -y md${mdstart}$part + fsck -t ufs -y md$mdstart + fsck -t ufs -y md$mdstart rm -f $D exit 0 fi @@ -83,9 +83,8 @@ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart dd if=/dev/zero of=$D bs=1m count=1k status=none || exit 1 mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cd $mntpoint chmod 777 $mntpoint @@ -106,8 +105,8 @@ cd $here while mount | grep -q $mntpoint; do umount $mntpoint || sleep 1 done -fsck -t ufs -y md${mdstart}$part -fsck -t ufs -y md${mdstart}$part +fsck -t ufs -y md$mdstart +fsck -t ufs -y md$mdstart mdconfig -d -u $mdstart rm -f /tmp/suj22 $D exit 0 diff --git a/tools/test/stress2/misc/suj23.sh b/tools/test/stress2/misc/suj23.sh index aca810d42485..ee8920369680 100755 --- a/tools/test/stress2/misc/suj23.sh +++ b/tools/test/stress2/misc/suj23.sh @@ -49,9 +49,8 @@ mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c '/tmp/suj23' diff --git a/tools/test/stress2/misc/suj24.sh b/tools/test/stress2/misc/suj24.sh index 68cb3dae2ff4..7ef8be5d5eb4 100755 --- a/tools/test/stress2/misc/suj24.sh +++ b/tools/test/stress2/misc/suj24.sh @@ -40,9 +40,8 @@ mount | grep "$mntpoint" | grep -q md$mdstart && umount $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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; mksnap_ffs $mntpoint/.snap/snapshot) diff --git a/tools/test/stress2/misc/suj25.sh b/tools/test/stress2/misc/suj25.sh index 325fb9c39dc8..de8a1e710d86 100755 --- a/tools/test/stress2/misc/suj25.sh +++ b/tools/test/stress2/misc/suj25.sh @@ -39,11 +39,10 @@ mount | grep -w $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 -j md${mdstart}$part > /dev/null 2>&1 +newfs -j md$mdstart > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint cp -R /usr/include $mntpoint/1 diff --git a/tools/test/stress2/misc/suj26.sh b/tools/test/stress2/misc/suj26.sh index 90888c3f3892..940ef5c92a29 100755 --- a/tools/test/stress2/misc/suj26.sh +++ b/tools/test/stress2/misc/suj26.sh @@ -38,12 +38,11 @@ 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 [ $# -eq 1 ] && opt="$1" || opt="-j" -newfs $opt md${mdstart}$part > /dev/null 2>&1 +newfs $opt md$mdstart > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=30m diff --git a/tools/test/stress2/misc/suj27.sh b/tools/test/stress2/misc/suj27.sh index f4f014260343..8253243f5868 100755 --- a/tools/test/stress2/misc/suj27.sh +++ b/tools/test/stress2/misc/suj27.sh @@ -38,12 +38,11 @@ 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 [ $# -eq 1 ] && opt="$1" || opt="-j" -newfs $opt md${mdstart}$part > /dev/null 2>&1 +newfs $opt md$mdstart > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=30m diff --git a/tools/test/stress2/misc/suj28.sh b/tools/test/stress2/misc/suj28.sh index 39f31428a196..e55fea11de61 100755 --- a/tools/test/stress2/misc/suj28.sh +++ b/tools/test/stress2/misc/suj28.sh @@ -37,12 +37,11 @@ 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 [ $# -eq 1 ] && opt="$1" || opt="-j" -newfs $opt md${mdstart}$part > /dev/null 2>&1 +newfs $opt md$mdstart > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint mount chmod 777 $mntpoint diff --git a/tools/test/stress2/misc/suj29.sh b/tools/test/stress2/misc/suj29.sh index 69f07abc2396..105fdea79e16 100755 --- a/tools/test/stress2/misc/suj29.sh +++ b/tools/test/stress2/misc/suj29.sh @@ -41,13 +41,12 @@ 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 -U md${mdstart}$part > /dev/null -echo "tunefs -j enable -S 10000000 /dev/md${mdstart}$part" -tunefs -j enable -S 10000000 /dev/md${mdstart}$part +newfs -U md$mdstart > /dev/null +echo "tunefs -j enable -S 10000000 /dev/md$mdstart" +tunefs -j enable -S 10000000 /dev/md$mdstart -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m @@ -67,8 +66,8 @@ su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? -tunefs -j disable /dev/md${mdstart}$part -checkfs /dev/md${mdstart}$part || s=$? +checkfs /dev/md$mdstart; s=$? +tunefs -j disable /dev/md$mdstart +checkfs /dev/md$mdstart || s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/suj30.sh b/tools/test/stress2/misc/suj30.sh index 7e168e7c3f1c..eb181213b320 100755 --- a/tools/test/stress2/misc/suj30.sh +++ b/tools/test/stress2/misc/suj30.sh @@ -44,9 +44,8 @@ mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 4g -u $mdstart -bsdlabel -w md$mdstart auto -newfs -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint for i in `jot 10`; do diff --git a/tools/test/stress2/misc/suj31.sh b/tools/test/stress2/misc/suj31.sh index e875d1f94076..f9facc779363 100755 --- a/tools/test/stress2/misc/suj31.sh +++ b/tools/test/stress2/misc/suj31.sh @@ -40,9 +40,8 @@ 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 -U md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -U md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=10m @@ -52,14 +51,14 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -tunefs -j enable /dev/md${mdstart}$part -mount /dev/md${mdstart}$part $mntpoint +tunefs -j enable /dev/md$mdstart +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint 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}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/suj32.sh b/tools/test/stress2/misc/suj32.sh index b9c14339ccbb..532cbf197f5c 100755 --- a/tools/test/stress2/misc/suj32.sh +++ b/tools/test/stress2/misc/suj32.sh @@ -44,9 +44,8 @@ mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs -U md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint || exit 1 +newfs -U md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint || exit 1 # fill the root directory to become larger than NIDIR * blksize (cd $mntpoint; /tmp/suj32) @@ -54,11 +53,11 @@ while mount | grep -q $mntpoint; do umount $mntpoint || sleep 1 done -tunefs -j enable /dev/md${mdstart}$part +tunefs -j enable /dev/md$mdstart -if ! mount /dev/md${mdstart}$part $mntpoint; then +if ! mount /dev/md$mdstart $mntpoint; then echo FAIL - fsck_ffs -y /dev/md${mdstart}$part + fsck_ffs -y /dev/md$mdstart else umount $mntpoint fi diff --git a/tools/test/stress2/misc/suj33.sh b/tools/test/stress2/misc/suj33.sh index 44861d1b6739..eb90035138aa 100755 --- a/tools/test/stress2/misc/suj33.sh +++ b/tools/test/stress2/misc/suj33.sh @@ -37,13 +37,12 @@ . ../default.cfg -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && umount $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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=3m # Run tests for three minutes chmod 777 $mntpoint @@ -61,6 +60,6 @@ for i in `jot 6`; do [ $i -eq 6 ] && { echo FAIL; fstat -mf $mntpoint; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/suj34.sh b/tools/test/stress2/misc/suj34.sh index 2b60c289b163..555c792dd1be 100755 --- a/tools/test/stress2/misc/suj34.sh +++ b/tools/test/stress2/misc/suj34.sh @@ -38,10 +38,9 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 4g -u $mdstart -bsdlabel -w md$mdstart auto -newfs -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/null mnt2=${mntpoint}2 diff --git a/tools/test/stress2/misc/suj4.sh b/tools/test/stress2/misc/suj4.sh index 975f572a162d..27001a64a0e5 100755 --- a/tools/test/stress2/misc/suj4.sh +++ b/tools/test/stress2/misc/suj4.sh @@ -35,9 +35,8 @@ 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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX diff --git a/tools/test/stress2/misc/suj5.sh b/tools/test/stress2/misc/suj5.sh index 9dbaa90282ed..2e49e0706d6f 100755 --- a/tools/test/stress2/misc/suj5.sh +++ b/tools/test/stress2/misc/suj5.sh @@ -42,9 +42,8 @@ cd $here 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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "cd $mntpoint; /tmp/suj5" > /dev/null diff --git a/tools/test/stress2/misc/suj6.sh b/tools/test/stress2/misc/suj6.sh index b769e1d3c6e1..b40412033f85 100755 --- a/tools/test/stress2/misc/suj6.sh +++ b/tools/test/stress2/misc/suj6.sh @@ -43,9 +43,8 @@ cd $here 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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "cd $mntpoint; /tmp/suj6" > /dev/null diff --git a/tools/test/stress2/misc/suj7.sh b/tools/test/stress2/misc/suj7.sh index 9975e701e86b..5e8b82eab402 100755 --- a/tools/test/stress2/misc/suj7.sh +++ b/tools/test/stress2/misc/suj7.sh @@ -35,9 +35,8 @@ 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 -j md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -j md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chflags 0 $mntpoint/.sujournal rm -f $mntpoint/.sujournal @@ -51,8 +50,8 @@ done # Failed to start journal: 2 echo "Expect: \"mount: /dev/md5a: No such file or directory\"" -[ -c /dev/md${mdstart}$part ] && - mount /dev/md${mdstart}$part $mntpoint +[ -c /dev/md$mdstart ] && + mount /dev/md$mdstart $mntpoint while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint > /dev/null 2>&1 || sleep 1 diff --git a/tools/test/stress2/misc/suj8.sh b/tools/test/stress2/misc/suj8.sh index 890caf2a27fd..5aed0813b7f8 100755 --- a/tools/test/stress2/misc/suj8.sh +++ b/tools/test/stress2/misc/suj8.sh @@ -37,24 +37,23 @@ 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 128M -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto n=0 s=0 for i in 1 2 ; do n=$((n + 1)) - echo "newfs -U md${mdstart}$part" - newfs -U md${mdstart}$part > /dev/null - [ $n -eq 2 ] && tunefs -j enable /dev/md${mdstart}$part + echo "newfs -U md$mdstart" + newfs -U md$mdstart > /dev/null + [ $n -eq 2 ] && tunefs -j enable /dev/md$mdstart - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint dd if=/dev/zero of=$mntpoint/big bs=4k > /dev/null 2>&1 while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done - checkfs /dev/md${mdstart}$part || s=1 + checkfs /dev/md$mdstart || s=1 done mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/suj9.sh b/tools/test/stress2/misc/suj9.sh index 72d9f7382061..0a4a5cf7da87 100755 --- a/tools/test/stress2/misc/suj9.sh +++ b/tools/test/stress2/misc/suj9.sh @@ -40,12 +40,11 @@ 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 128m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto for i in `jot 2`; do - newfs -j md${mdstart}$part > /dev/null + newfs -j md$mdstart > /dev/null - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m diff --git a/tools/test/stress2/misc/swap2.sh b/tools/test/stress2/misc/swap2.sh index faba6c6ec956..d840651fc4b4 100755 --- a/tools/test/stress2/misc/swap2.sh +++ b/tools/test/stress2/misc/swap2.sh @@ -39,9 +39,8 @@ 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX diff --git a/tools/test/stress2/misc/swapoff.sh b/tools/test/stress2/misc/swapoff.sh index 3251653d472f..4a515254ef3e 100755 --- a/tools/test/stress2/misc/swapoff.sh +++ b/tools/test/stress2/misc/swapoff.sh @@ -42,9 +42,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m diff --git a/tools/test/stress2/misc/swapoff2.sh b/tools/test/stress2/misc/swapoff2.sh index e86f868ddb01..c21d8b80a35a 100755 --- a/tools/test/stress2/misc/swapoff2.sh +++ b/tools/test/stress2/misc/swapoff2.sh @@ -39,9 +39,8 @@ set -e 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 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e : ${size:=2m} diff --git a/tools/test/stress2/misc/symlink3.sh b/tools/test/stress2/misc/symlink3.sh index 16f10d1a7bec..bc4cf317a2ca 100755 --- a/tools/test/stress2/misc/symlink3.sh +++ b/tools/test/stress2/misc/symlink3.sh @@ -37,9 +37,8 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint umount $mntpoint @@ -54,7 +53,7 @@ testcases/symlink/symlink " for i in `jot 10`; do - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' diff --git a/tools/test/stress2/misc/symlink4.sh b/tools/test/stress2/misc/symlink4.sh index 7184b2a1ed28..973d459f714d 100755 --- a/tools/test/stress2/misc/symlink4.sh +++ b/tools/test/stress2/misc/symlink4.sh @@ -49,9 +49,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/syscall4.sh b/tools/test/stress2/misc/syscall4.sh index 209a00f7af9b..ce7e99dcde54 100755 --- a/tools/test/stress2/misc/syscall4.sh +++ b/tools/test/stress2/misc/syscall4.sh @@ -64,9 +64,8 @@ mount | grep -q "on $mntpoint " && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint [ -z "$noswap" ] && @@ -90,11 +89,11 @@ while pkill -9 swap; do :; done while pkill -9 syscall4; do :; done for i in `jot 10`; do - mount | grep -q md${mdstart}$part && \ + mount | grep -q md$mdstart && \ umount $mntpoint && mdconfig -d -u $mdstart && break sleep 10 done -if mount | grep -q md${mdstart}$part; then +if mount | grep -q md$mdstart; then fstat $mntpoint echo "umount $mntpoint failed" exit 1 diff --git a/tools/test/stress2/misc/trim.sh b/tools/test/stress2/misc/trim.sh index 2dee27ec96ec..520f855e9eb1 100755 --- a/tools/test/stress2/misc/trim.sh +++ b/tools/test/stress2/misc/trim.sh @@ -49,11 +49,10 @@ export MAXSWAPPCT=80 for flag in ' ' $opt; do echo "mdconfig -a -t malloc -o reserve -s $size -u $mdstart" mdconfig -a -t malloc -o reserve -s $size -u $mdstart || exit 1 - bsdlabel -w md$mdstart auto - echo "newfs $trim $flag md${mdstart}$part" - newfs $trim $flag md${mdstart}$part > /dev/null - mount /dev/md${mdstart}$part $mntpoint || exit 1 + echo "newfs $trim $flag md$mdstart" + newfs $trim $flag md$mdstart > /dev/null + mount /dev/md$mdstart $mntpoint || exit 1 chmod 777 $mntpoint export runRUNTIME=5m @@ -65,7 +64,7 @@ for flag in ' ' $opt; do umount $mntpoint && break || sleep 10 done [ $i -eq 6 ] && { s=1; break; } - checkfs /dev/md${mdstart}$part || s=1 + checkfs /dev/md$mdstart || s=1 mdconfig -d -u $mdstart done [ $malloc_wait != 1 ] && sysctl vm.md_malloc_wait=$malloc_wait diff --git a/tools/test/stress2/misc/trim2.sh b/tools/test/stress2/misc/trim2.sh index f1f71cc9087a..19a55ff03a8c 100755 --- a/tools/test/stress2/misc/trim2.sh +++ b/tools/test/stress2/misc/trim2.sh @@ -36,10 +36,9 @@ mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t malloc -o reserve -s 128m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto [ $# -eq 0 ] && trim=-t -newfs $trim $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $trim $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint echo "This is a Trim (TRIM) test." >> $mntpoint/file for i in `jot 20`; do @@ -52,8 +51,8 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -grep -a -qm1 Trim /dev/md${mdstart}$part && { echo "Test failed"; s=1; } +grep -a -qm1 Trim /dev/md$mdstart && { echo "Test failed"; s=1; } -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s diff --git a/tools/test/stress2/misc/trim3.sh b/tools/test/stress2/misc/trim3.sh index 125c763f3546..959a86b4a1b7 100755 --- a/tools/test/stress2/misc/trim3.sh +++ b/tools/test/stress2/misc/trim3.sh @@ -46,12 +46,11 @@ s=0 for flag in ' ' $opt; do echo "mdconfig -a -t swap -s $size -u $mdstart" mdconfig -a -t swap -s $size -u $mdstart || exit 1 - bsdlabel -w md$mdstart auto - echo "newfs $trim $flag md${mdstart}$part" - newfs $trim $flag md${mdstart}$part > /dev/null + echo "newfs $trim $flag md$mdstart" + newfs $trim $flag md$mdstart > /dev/null - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=7m @@ -65,7 +64,7 @@ for flag in ' ' $opt; do [ $i -eq 6 ] && { echo FAIL; fstat -mf $mntpoint; exit 1; } done - checkfs /dev/md${mdstart}$part || s=$? + checkfs /dev/md$mdstart || s=$? mdconfig -d -u $mdstart done exit $s diff --git a/tools/test/stress2/misc/trim4.sh b/tools/test/stress2/misc/trim4.sh index fc23c53b09af..5fad2c084288 100755 --- a/tools/test/stress2/misc/trim4.sh +++ b/tools/test/stress2/misc/trim4.sh @@ -45,12 +45,11 @@ while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do echo "Test `date '+%T'`" echo "mdconfig -a -t swap -s $size -u $mdstart" mdconfig -a -t swap -s $size -u $mdstart || exit 1 - bsdlabel -w md$mdstart auto - echo "newfs $trim $flag md${mdstart}$part" - newfs $trim $flag md${mdstart}$part > /dev/null + echo "newfs $trim $flag md$mdstart" + newfs $trim $flag md$mdstart > /dev/null - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m @@ -62,7 +61,7 @@ while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do umount $mntpoint || sleep 1 done # Do not break in case of fsck error - checkfs /dev/md${mdstart}$part || s=$? + checkfs /dev/md$mdstart || s=$? mdconfig -d -u $mdstart done exit $s diff --git a/tools/test/stress2/misc/trim5.sh b/tools/test/stress2/misc/trim5.sh index a03efbd33e54..0f8ff9ae705d 100755 --- a/tools/test/stress2/misc/trim5.sh +++ b/tools/test/stress2/misc/trim5.sh @@ -37,9 +37,8 @@ mount | grep "$mntpoint " | grep -q md$mdstart && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t malloc -s 128m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags -t md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -t md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mksnap_ffs $mntpoint $mntpoint/.snap/snap diff --git a/tools/test/stress2/misc/truncate3.sh b/tools/test/stress2/misc/truncate3.sh index af1b41cdb6c3..13ddaa37bdaa 100755 --- a/tools/test/stress2/misc/truncate3.sh +++ b/tools/test/stress2/misc/truncate3.sh @@ -36,10 +36,9 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 400m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX here=`pwd` @@ -62,7 +61,7 @@ while mount | grep -q $mntpoint; do umount $mntpoint done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s EOF diff --git a/tools/test/stress2/misc/truncate4.sh b/tools/test/stress2/misc/truncate4.sh index 394970c55b12..7d83926217f9 100755 --- a/tools/test/stress2/misc/truncate4.sh +++ b/tools/test/stress2/misc/truncate4.sh @@ -36,18 +36,17 @@ 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 s=0 for size in $((4 * 1024 * 1024 * 1024 - 1)) $((4 * 1024 * 1024 * 1024)); do - newfs $newfs_flags md${mdstart}$part > /dev/null - mount /dev/md${mdstart}$part $mntpoint + newfs $newfs_flags md$mdstart > /dev/null + mount /dev/md$mdstart $mntpoint truncate -s $size $mntpoint/f1 && rm $mntpoint/f1 while mount | grep "$mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 done - checkfs /dev/md${mdstart}$part || s=1 + checkfs /dev/md$mdstart || s=1 done mdconfig -d -u $mdstart rm -f /tmp/fsck.log diff --git a/tools/test/stress2/misc/truncate5.sh b/tools/test/stress2/misc/truncate5.sh index e21432b1f0a4..c04da55d8a47 100755 --- a/tools/test/stress2/misc/truncate5.sh +++ b/tools/test/stress2/misc/truncate5.sh @@ -36,10 +36,9 @@ 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 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint here=`pwd` cd /tmp @@ -56,11 +55,11 @@ cd $RUNDIR cd $here rm -f /tmp/truncate5 -while mount | grep -q md${mdstart}$part; do +while mount | grep -q md$mdstart; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s EOF diff --git a/tools/test/stress2/misc/truncate7.sh b/tools/test/stress2/misc/truncate7.sh index ec216721180c..710bb94414c9 100755 --- a/tools/test/stress2/misc/truncate7.sh +++ b/tools/test/stress2/misc/truncate7.sh @@ -37,14 +37,13 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 400m -u $mdstart -bsdlabel -w md$mdstart auto if [ `jot -r 1 0 1` -eq 0 ]; then - newfs $newfs_flags md${mdstart}$part > /dev/null + newfs $newfs_flags md$mdstart > /dev/null else - newfs md${mdstart}$part > /dev/null + newfs md$mdstart > /dev/null fi -mount /dev/md${mdstart}$part $mntpoint +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX here=`pwd` @@ -67,7 +66,7 @@ while mount | grep -q $mntpoint; do umount $mntpoint done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart exit $s EOF diff --git a/tools/test/stress2/misc/truncate8.sh b/tools/test/stress2/misc/truncate8.sh index d175623cb090..132468b3ca78 100755 --- a/tools/test/stress2/misc/truncate8.sh +++ b/tools/test/stress2/misc/truncate8.sh @@ -45,7 +45,9 @@ echo ufs: 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 +gpart create -s bsd md$mdstart > /dev/null +gpart add -t freebsd-ufs md$mdstart > /dev/null +part=a newfs $newfs_flags md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint @@ -72,7 +74,9 @@ fi echo msdos: if [ -x /sbin/mount_msdosfs ]; then mdconfig -a -t swap -s 1g -u $mdstart - bsdlabel -w md$mdstart auto + gpart create -s bsd md$mdstart > /dev/null + gpart add -t freebsd-ufs md$mdstart > /dev/null + part=a newfs_msdos -F 16 -b 8192 /dev/md${mdstart}$part > /dev/null 2>&1 mount_msdosfs -m 777 /dev/md${mdstart}$part $mntpoint diff --git a/tools/test/stress2/misc/truncate9.sh b/tools/test/stress2/misc/truncate9.sh index 1acda51aa7c8..c199605e70a8 100755 --- a/tools/test/stress2/misc/truncate9.sh +++ b/tools/test/stress2/misc/truncate9.sh @@ -40,9 +40,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e (cd $odir/../testcases/swap; ./swap -t 5m -i 20 -l 100) > /dev/null & diff --git a/tools/test/stress2/misc/tvnlru.sh b/tools/test/stress2/misc/tvnlru.sh index 09789a22b68e..6726ca8f4abb 100755 --- a/tools/test/stress2/misc/tvnlru.sh +++ b/tools/test/stress2/misc/tvnlru.sh @@ -63,9 +63,8 @@ cd $odir mount | grep -q "on $mntpoint " && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -n -b 4096 -f 512 -i 512 md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint +newfs -n -b 4096 -f 512 -i 512 md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint ncpu=`sysctl -n hw.ncpu` [ $ncpu -lt 4 ] && { rm /tmp/tvnlru; exit 0; } @@ -84,15 +83,15 @@ cd $mntpoint t1=`/tmp/tvnlru $ncpu $newmaxvnodes $newmaxvnodes $mntpoint 2>/dev/null` cd $odir umount $mntpoint -newfs -n -b 4096 -f 512 -i 512 md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint +newfs -n -b 4096 -f 512 -i 512 md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint cd $mntpoint t1=`/tmp/tvnlru $ncpu $newmaxvnodes $newmaxvnodes $mntpoint 2>$log` cd $odir umount $mntpoint -newfs -n -b 4096 -f 512 -i 512 md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint +newfs -n -b 4096 -f 512 -i 512 md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint cd $mntpoint echo >> $log diff --git a/tools/test/stress2/misc/ufsbench.sh b/tools/test/stress2/misc/ufsbench.sh index 9ea572132c52..03e8ba64e2f6 100755 --- a/tools/test/stress2/misc/ufsbench.sh +++ b/tools/test/stress2/misc/ufsbench.sh @@ -37,13 +37,12 @@ mycc -o /tmp/ufsbench -Wall -Wextra -O0 -g ../tools/bench.c || exit 1 mount | grep "on $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 s=0 for j in `jot 5`; do - newfs -n -b 4096 -f 512 -i 1024 md${mdstart}$part > \ + newfs -n -b 4096 -f 512 -i 1024 md$mdstart > \ /dev/null - mount -o async /dev/md${mdstart}$part $mntpoint + mount -o async /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/ufsbench) [ $? -ne 0 ] && s=1 for i in `jot 6`; do diff --git a/tools/test/stress2/misc/umount.sh b/tools/test/stress2/misc/umount.sh index 8ec0351cda31..b610a567e873 100755 --- a/tools/test/stress2/misc/umount.sh +++ b/tools/test/stress2/misc/umount.sh @@ -35,13 +35,12 @@ D=$diskimage dd if=/dev/zero of=$D bs=1m count=110 status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=3m # Run tests for three minutes (cd ..; ./run.sh vfs.cfg) diff --git a/tools/test/stress2/misc/umount2.sh b/tools/test/stress2/misc/umount2.sh index d78f7a836f15..fa8988d18e62 100755 --- a/tools/test/stress2/misc/umount2.sh +++ b/tools/test/stress2/misc/umount2.sh @@ -40,9 +40,8 @@ mount | grep -q "on $mntpoint " && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 5g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint size=$((`sysctl -n hw.physmem` / 1024 / 1024)) diff --git a/tools/test/stress2/misc/umount3.sh b/tools/test/stress2/misc/umount3.sh index 2ff0c8caeb56..c6920b80f99d 100755 --- a/tools/test/stress2/misc/umount3.sh +++ b/tools/test/stress2/misc/umount3.sh @@ -43,9 +43,8 @@ touch $continue [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 10m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint for i in `jot $parallel`; do while [ -f $continue ]; do umount $mntpoint; done 2>/dev/null & @@ -54,7 +53,7 @@ done start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ]; do mount | grep -q "on $mntpoint " || - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint done > /dev/null 2>&1 rm $continue wait diff --git a/tools/test/stress2/misc/umountf.sh b/tools/test/stress2/misc/umountf.sh index 125eb336749c..038e64e70717 100755 --- a/tools/test/stress2/misc/umountf.sh +++ b/tools/test/stress2/misc/umountf.sh @@ -35,14 +35,13 @@ D=$diskimage dd if=/dev/zero of=$D bs=1m count=110 status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm $diskimage; exit 1; } -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=2m diff --git a/tools/test/stress2/misc/umountf2.sh b/tools/test/stress2/misc/umountf2.sh index 6dc62bcd947b..5018a804c403 100755 --- a/tools/test/stress2/misc/umountf2.sh +++ b/tools/test/stress2/misc/umountf2.sh @@ -44,13 +44,12 @@ rm -f /tmp/fsx.c D=$diskimage dd if=/dev/zero of=$D bs=1m count=1k status=none || exit 1 -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null 2>&1 +mount /dev/md$mdstart $mntpoint sleep 5 for i in `jot 100`; do /tmp/fsx -S $i -q $mntpoint/xxx$i > /dev/null & diff --git a/tools/test/stress2/misc/umountf3.sh b/tools/test/stress2/misc/umountf3.sh index dd165fc88d2f..a451ece0e296 100755 --- a/tools/test/stress2/misc/umountf3.sh +++ b/tools/test/stress2/misc/umountf3.sh @@ -47,9 +47,8 @@ mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart -bsdlabel -w md$mdstart auto -newfs md${mdstart}$part > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null 2>&1 +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX for i in `jot 25`; do (cd /$mntpoint; /tmp/umountf3) & diff --git a/tools/test/stress2/misc/umountf4.sh b/tools/test/stress2/misc/umountf4.sh index e9f802e1daf0..4f5ea0fff660 100755 --- a/tools/test/stress2/misc/umountf4.sh +++ b/tools/test/stress2/misc/umountf4.sh @@ -46,8 +46,7 @@ if [ $# -eq 0 ]; then dd if=/dev/zero of=$D$m bs=1m count=10 status=none mdconfig -a -t vnode -f $D$m -u $m || { rm -f $D$m; exit 1; } - bsdlabel -w md$m auto - newfs md${m}$part > /dev/null 2>&1 + newfs md${m} > /dev/null 2>&1 done # start the parallel tests @@ -75,7 +74,7 @@ else for i in `jot 100`; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` - mount $opt /dev/md${m}$part ${mntpoint}$m + mount $opt /dev/md${m} ${mntpoint}$m cp -r /usr/include/machine/a* ${mntpoint}$m while mount | grep -qw $mntpoint$m; do umount -f ${mntpoint}$m > /dev/null 2>&1 diff --git a/tools/test/stress2/misc/umountf5.sh b/tools/test/stress2/misc/umountf5.sh index f5ebb253134a..0f44ea3407e4 100755 --- a/tools/test/stress2/misc/umountf5.sh +++ b/tools/test/stress2/misc/umountf5.sh @@ -35,14 +35,13 @@ D=$diskimage dd if=/dev/zero of=$D$m bs=1m count=10 status=none -mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && +mount | grep "$mntpoint" | grep md$mdstart > /dev/null && umount $mntpoint mdconfig -l | grep md$mdstart > /dev/null && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $diskimage; exit 1; } -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null 2>&1 +mount /dev/md$mdstart $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=2m diff --git a/tools/test/stress2/misc/umountf6.sh b/tools/test/stress2/misc/umountf6.sh index b42a8071aaa8..aeb4454ea69c 100755 --- a/tools/test/stress2/misc/umountf6.sh +++ b/tools/test/stress2/misc/umountf6.sh @@ -46,8 +46,7 @@ if [ $# -eq 0 ]; then dd if=/dev/zero of=$D$m bs=1m count=10 status=none mdconfig -a -t vnode -f $D$m -u $m || { rm -f $D$m; exit 1; } - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -75,7 +74,7 @@ else for i in `jot 100`; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` - mount $opt /dev/md${m}$part ${mntpoint}$m + mount $opt /dev/md${m} ${mntpoint}$m cp -r /usr/include/machine/a* ${mntpoint}$m while mount | grep -qw $mntpoint$m; do umount -f ${mntpoint}$m > /dev/null 2>&1 diff --git a/tools/test/stress2/misc/umountf7.sh b/tools/test/stress2/misc/umountf7.sh index d4a52b4ce8f2..be1d971a6586 100755 --- a/tools/test/stress2/misc/umountf7.sh +++ b/tools/test/stress2/misc/umountf7.sh @@ -46,10 +46,9 @@ cd $odir 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 3g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto [ "$newfs_flags" = "-U" ] && opt="-j" -newfs $opt md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $opt md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint daemon sh -c '(cd ../testcases/swap; ./swap -t 2m -i 4)' parallel=4 diff --git a/tools/test/stress2/misc/union.sh b/tools/test/stress2/misc/union.sh index cef2e4c69868..25eb266eb39b 100755 --- a/tools/test/stress2/misc/union.sh +++ b/tools/test/stress2/misc/union.sh @@ -35,31 +35,29 @@ u1=$mdstart u2=$((u1 + 1)) -mount | grep -q /dev/md${u2}$part && umount -f /dev/md${u2}$part -mount | grep -q /dev/md${u1}$part && umount -f /dev/md${u1}$part +mount | grep -q /dev/md${u2} && umount -f /dev/md${u2} +mount | grep -q /dev/md${u1} && umount -f /dev/md${u1} mdconfig -l | grep -q md$u2 && mdconfig -d -u $u2 mdconfig -l | grep -q md$u1 && mdconfig -d -u $u1 mdconfig -s 256m -u $u1 -bsdlabel -w md$u1 auto -newfs md${u1}$part > /dev/null +newfs md${u1} > /dev/null mdconfig -s 256m -u $u2 -bsdlabel -w md$u2 auto -newfs md${u2}$part > /dev/null +newfs md${u2} > /dev/null -mount -o ro /dev/md${u1}$part $mntpoint -mount -o union /dev/md${u2}$part $mntpoint +mount -o ro /dev/md${u1} $mntpoint +mount -o union /dev/md${u2} $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=10m (cd ..; ./run.sh marcus.cfg) > /dev/null -umount /dev/md${u2}$part -umount /dev/md${u1}$part +umount /dev/md${u2} +umount /dev/md${u1} -mount | grep -q /dev/md${u2}$part && umount -f /dev/md${u2}$part -mount | grep -q /dev/md${u1}$part && umount -f /dev/md${u1}$part +mount | grep -q /dev/md${u2} && umount -f /dev/md${u2} +mount | grep -q /dev/md${u1} && umount -f /dev/md${u1} mdconfig -d -u $u2 mdconfig -d -u $u1 diff --git a/tools/test/stress2/misc/unionfs3.sh b/tools/test/stress2/misc/unionfs3.sh index 9b1a43344447..791da14e315c 100755 --- a/tools/test/stress2/misc/unionfs3.sh +++ b/tools/test/stress2/misc/unionfs3.sh @@ -39,9 +39,8 @@ mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t vnode -f $diskimage -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mount -t unionfs -o noatime /tmp $mntpoint umount -f /tmp # panic mount /tmp diff --git a/tools/test/stress2/misc/vunref.sh b/tools/test/stress2/misc/vunref.sh index 8b245aa20a13..f844a0dd3625 100755 --- a/tools/test/stress2/misc/vunref.sh +++ b/tools/test/stress2/misc/vunref.sh @@ -55,8 +55,7 @@ if [ $# -eq 0 ]; then dd if=/dev/zero of=$D.$m bs=1m count=10 status=none mdconfig -a -t vnode -f $D.$m -u $m - bsdlabel -w md$m auto - newfs md${m}$part > /dev/null 2>&1 + newfs md${m} > /dev/null 2>&1 done # start the parallel tests @@ -94,7 +93,7 @@ else else # The test: Parallel mount and unmounts m=$1 - mount $opt /dev/md${m}$part ${mntpoint}$m + mount $opt /dev/md${m} ${mntpoint}$m while [ -f $RUNDIR/active.$m ] ; do sleep 0.1 n=0 @@ -108,7 +107,7 @@ else fi sleep 0.1 done - mount $opt /dev/md${m}$part ${mntpoint}$m + mount $opt /dev/md${m} ${mntpoint}$m done mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m fi diff --git a/tools/test/stress2/misc/vunref2.sh b/tools/test/stress2/misc/vunref2.sh index 974af4bf8d80..9a8876666dda 100755 --- a/tools/test/stress2/misc/vunref2.sh +++ b/tools/test/stress2/misc/vunref2.sh @@ -34,13 +34,12 @@ . ../default.cfg -mount | grep "$mntpoint" | grep -q md${mdstart}$part && umount -f $mntpoint +mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 12m -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m @@ -65,7 +64,7 @@ for i in `jot 10`; do exit 1 fi done - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint done umount $mntpoint |