svn commit: r258968 - user/pho/stress2/misc
Peter Holm
pho at FreeBSD.org
Thu Dec 5 08:20:59 UTC 2013
Author: pho
Date: Thu Dec 5 08:20:46 2013
New Revision: 258968
URL: http://svnweb.freebsd.org/changeset/base/258968
Log:
Do not assume that Soft Update (newfs -U) is the default. Use a flag from
the default.cfg configuration file.
Sponsored by: EMC / Isilon storage division
Modified:
user/pho/stress2/misc/crossmp.sh
user/pho/stress2/misc/devfd.sh
user/pho/stress2/misc/dfull.sh
user/pho/stress2/misc/extattr_set_fd.sh
user/pho/stress2/misc/ffs_syncvnode2.sh
user/pho/stress2/misc/flock_open_close.sh
user/pho/stress2/misc/fragments.sh
user/pho/stress2/misc/fts.sh
user/pho/stress2/misc/gbde.sh
user/pho/stress2/misc/graid3.sh
user/pho/stress2/misc/kevent6.sh
user/pho/stress2/misc/kevent7.sh
user/pho/stress2/misc/kevent8.sh
user/pho/stress2/misc/linger.sh
user/pho/stress2/misc/linger2.sh
user/pho/stress2/misc/linger3.sh
user/pho/stress2/misc/marcus.sh
user/pho/stress2/misc/marcus2.sh
user/pho/stress2/misc/md3.sh
user/pho/stress2/misc/mmap4.sh
user/pho/stress2/misc/mountro.sh
user/pho/stress2/misc/mountro2.sh
user/pho/stress2/misc/mountro3.sh
user/pho/stress2/misc/mountu.sh
user/pho/stress2/misc/namecache2.sh
user/pho/stress2/misc/nfs10.sh
user/pho/stress2/misc/nfs11.sh
user/pho/stress2/misc/nfs5.sh
user/pho/stress2/misc/nfs6.sh
user/pho/stress2/misc/nullfs10.sh
user/pho/stress2/misc/nullfs11.sh
user/pho/stress2/misc/nullfs13.sh
user/pho/stress2/misc/nullfs14.sh
user/pho/stress2/misc/nullfs15.sh
user/pho/stress2/misc/nullfs7.sh
user/pho/stress2/misc/nullfs9.sh
user/pho/stress2/misc/parallelmount.sh
user/pho/stress2/misc/pread.sh
user/pho/stress2/misc/quota4.sh
user/pho/stress2/misc/quota9.sh
user/pho/stress2/misc/rename10.sh
user/pho/stress2/misc/rename5.sh
user/pho/stress2/misc/rename6.sh
user/pho/stress2/misc/rename7.sh
user/pho/stress2/misc/rename8.sh
user/pho/stress2/misc/rot.sh
user/pho/stress2/misc/sendfile5.sh
user/pho/stress2/misc/sendfile6.sh
user/pho/stress2/misc/setuid.sh
user/pho/stress2/misc/sigxcpu.sh
user/pho/stress2/misc/snap8.sh
user/pho/stress2/misc/swap2.sh
user/pho/stress2/misc/trim2.sh
user/pho/stress2/misc/truncate3.sh
user/pho/stress2/misc/truncate4.sh
user/pho/stress2/misc/truncate5.sh
user/pho/stress2/misc/umountf5.sh
user/pho/stress2/misc/umountf6.sh
user/pho/stress2/misc/vunref2.sh
Modified: user/pho/stress2/misc/crossmp.sh
==============================================================================
--- user/pho/stress2/misc/crossmp.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/crossmp.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -48,7 +48,7 @@ if [ $# -eq 0 ]; then
dede $D$m 1m 1
mdconfig -a -t vnode -f $D$m -u $m
bsdlabel -w md$m auto
- newfs -U md${m}$part > /dev/null 2>&1
+ newfs $newfs_flags md${m}$part > /dev/null 2>&1
done
# start the parallel tests
Modified: user/pho/stress2/misc/devfd.sh
==============================================================================
--- user/pho/stress2/misc/devfd.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/devfd.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -50,7 +50,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/dfull.sh
==============================================================================
--- user/pho/stress2/misc/dfull.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/dfull.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -40,7 +40,7 @@ mdconfig -l | grep md$mdstart > /dev/nul
mdconfig -a -t swap -s 512m -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
export RUNDIR=${mntpoint}/stressX
Modified: user/pho/stress2/misc/extattr_set_fd.sh
==============================================================================
--- user/pho/stress2/misc/extattr_set_fd.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/extattr_set_fd.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -45,7 +45,7 @@ mount | grep -q "$mntpoint" && umount $m
mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null
+newfs $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/ffs_syncvnode2.sh
==============================================================================
--- user/pho/stress2/misc/ffs_syncvnode2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/ffs_syncvnode2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -45,7 +45,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 2g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/flock_open_close.sh
==============================================================================
--- user/pho/stress2/misc/flock_open_close.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/flock_open_close.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -48,7 +48,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/fragments.sh
==============================================================================
--- user/pho/stress2/misc/fragments.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/fragments.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -52,7 +52,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U -m 0 md${mdstart}$part > /dev/null 2>&1
+newfs $newfs_flags -m 0 md${mdstart}$part > /dev/null 2>&1
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/fts.sh
==============================================================================
--- user/pho/stress2/misc/fts.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/fts.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -48,7 +48,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/gbde.sh
==============================================================================
--- user/pho/stress2/misc/gbde.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/gbde.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -41,7 +41,7 @@ mdconfig -a -t swap -s 1g -u $mdstart
gbde init /dev/md$mdstart -P pass-phrase || exit
gbde attach md$mdstart -p pass-phrase || exit
-newfs -U /dev/md$mdstart.bde > /dev/null
+newfs $newfs_flags /dev/md$mdstart.bde > /dev/null
mount /dev/md$mdstart.bde $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/graid3.sh
==============================================================================
--- user/pho/stress2/misc/graid3.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/graid3.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -46,7 +46,7 @@ done
graid3 load || exit
graid3 label -v -r data md$md1 md$md2 md$md3 > /dev/null || exit
-newfs -U /dev/raid3/data > /dev/null
+newfs $newfs_flags /dev/raid3/data > /dev/null
mount /dev/raid3/data $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/kevent6.sh
==============================================================================
--- user/pho/stress2/misc/kevent6.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/kevent6.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -46,7 +46,7 @@ mdconfig -l | grep -q $mdstart && mdconf
mdconfig -a -t swap -s 2g -u ${mdstart}
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/kevent7.sh
==============================================================================
--- user/pho/stress2/misc/kevent7.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/kevent7.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -52,7 +52,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 2g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/kevent8.sh
==============================================================================
--- user/pho/stress2/misc/kevent8.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/kevent8.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -47,7 +47,7 @@ mdconfig -l | grep -q $mdstart && mdconf
mdconfig -a -t swap -s 2g -u ${mdstart}
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/linger.sh
==============================================================================
--- user/pho/stress2/misc/linger.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/linger.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -46,7 +46,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
[ $# -eq 1 ] && opt="$1"
-[ $# -eq 0 ] && opt=-U # No argument == -U
+[ $# -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
Modified: user/pho/stress2/misc/linger2.sh
==============================================================================
--- user/pho/stress2/misc/linger2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/linger2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -46,7 +46,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
[ $# -eq 1 ] && opt="$1"
-[ $# -eq 0 ] && opt=-U # The default is "-U"
+[ $# -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
Modified: user/pho/stress2/misc/linger3.sh
==============================================================================
--- user/pho/stress2/misc/linger3.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/linger3.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -46,7 +46,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 2g -u $mdstart
bsdlabel -w md$mdstart auto
[ $# -eq 1 ] && opt="$1"
-[ $# -eq 0 ] && opt=-U # The default is "-U"
+[ $# -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
Modified: user/pho/stress2/misc/marcus.sh
==============================================================================
--- user/pho/stress2/misc/marcus.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/marcus.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -38,7 +38,7 @@ mount | grep $mntpoint | grep -q /dev/md
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/marcus2.sh
==============================================================================
--- user/pho/stress2/misc/marcus2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/marcus2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -41,7 +41,7 @@ mount | grep $mntpoint | grep -q /dev/md
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 2g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/md3.sh
==============================================================================
--- user/pho/stress2/misc/md3.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/md3.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -25,7 +25,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: nfs.sh,v 1.2 2008/02/25 16:31:43 pho Exp $
+# $FreeBSD$
#
# Test scenario for deadlock fixed in r200447
@@ -40,8 +40,8 @@ mdconfig -l | grep -q $mdstart && mdcon
mdconfig -a -t swap -s 1400m -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md5${part} > /dev/null
-mount /dev/md5${part} /mnt
+newfs $newfs_flags md5${part} > /dev/null
+mount /dev/md5${part} $mntpoint
# Stop FS "out of inodes" problem by only using 70%
set `df -ik /mnt | tail -1 | awk '{print $4,$7}'`
Modified: user/pho/stress2/misc/mmap4.sh
==============================================================================
--- user/pho/stress2/misc/mmap4.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/mmap4.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -50,8 +50,8 @@ mdconfig -l | grep -q $mdstart && mdcon
mdconfig -a -t swap -s 40m -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null
-mount /dev/md${mdstart}${part} $mntpoint
+newfs $newfs_flags md${mdstart}$part > /dev/null
+mount /dev/md${mdstart}$part $mntpoint
/tmp/mmap4 /$mntpoint/file
ls -lh $mntpoint
Modified: user/pho/stress2/misc/mountro.sh
==============================================================================
--- user/pho/stress2/misc/mountro.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/mountro.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -42,7 +42,7 @@ mdconfig -l | grep -q ${mdstart} && md
mdconfig -a -t vnode -f $D -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null 2>&1
+newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1
mount /dev/md${mdstart}${part} $mntpoint
mkdir ${mntpoint}/stressX
@@ -50,7 +50,7 @@ chmod 777 ${mntpoint}/stressX
export RUNDIR=${mntpoint}/stressX
export runRUNTIME=4m
-(cd ..; ./run.sh disk.cfg) &
+(cd ..; ./run.sh disk.cfg > /dev/null 2>&1) &
sleep 30
for i in `jot 10`; do
Modified: user/pho/stress2/misc/mountro2.sh
==============================================================================
--- user/pho/stress2/misc/mountro2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/mountro2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -44,7 +44,7 @@ mdconfig -l | grep -q ${mdstart} && md
mdconfig -a -t vnode -f $D -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null 2>&1
+newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1
mount /dev/md${mdstart}${part} $mntpoint
mtree -deU -f /etc/mtree/BSD.usr.dist -p $mntpoint/ >> /dev/null
Modified: user/pho/stress2/misc/mountro3.sh
==============================================================================
--- user/pho/stress2/misc/mountro3.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/mountro3.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -43,7 +43,7 @@ mdconfig -l | grep md${mdstart} > /dev/n
mdconfig -a -t vnode -f $D -u ${mdstart}
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null 2>&1
+newfs $newfs_flags md${mdstart}${part} > /dev/null 2>&1
mount /dev/md${mdstart}${part} $mntpoint
touch $mntpoint/file
Modified: user/pho/stress2/misc/mountu.sh
==============================================================================
--- user/pho/stress2/misc/mountu.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/mountu.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -50,7 +50,7 @@ mount | grep -q "$mntpoint " && umount $
mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 100m -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null
+newfs $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/namecache2.sh
==============================================================================
--- user/pho/stress2/misc/namecache2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/namecache2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -55,7 +55,7 @@ mount | grep $mntpoint | grep -q /dev/md
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
(cd $mntpoint; /tmp/namecache2)
Modified: user/pho/stress2/misc/nfs10.sh
==============================================================================
--- user/pho/stress2/misc/nfs10.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nfs10.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -46,7 +46,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 2g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/nfs11.sh
==============================================================================
--- user/pho/stress2/misc/nfs11.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nfs11.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -45,7 +45,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 2g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/nfs5.sh
==============================================================================
--- user/pho/stress2/misc/nfs5.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nfs5.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -42,7 +42,7 @@ mdconfig -l | grep -q ${mdstart} && md
mdconfig -a -t vnode -f $D -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null
+newfs $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
mkdir ${mntpoint}/stressX
Modified: user/pho/stress2/misc/nfs6.sh
==============================================================================
--- user/pho/stress2/misc/nfs6.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nfs6.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -44,7 +44,7 @@ mdconfig -l | grep -q ${mdstart} && md
mdconfig -a -t vnode -f $D -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null
+newfs $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
mkdir ${mntpoint}/stressX
Modified: user/pho/stress2/misc/nullfs10.sh
==============================================================================
--- user/pho/stress2/misc/nullfs10.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nullfs10.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -48,7 +48,7 @@ mount | grep $mnt2 | grep -q /dev/md &&
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/nullfs11.sh
==============================================================================
--- user/pho/stress2/misc/nullfs11.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nullfs11.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -57,7 +57,7 @@ test() {
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
+ newfs $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}$part $mp1
mount -t nullfs $opt $mp1 $mp2
Modified: user/pho/stress2/misc/nullfs13.sh
==============================================================================
--- user/pho/stress2/misc/nullfs13.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nullfs13.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -42,7 +42,7 @@ mount | grep "$mntpoint " | grep -q /dev
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
mount -t nullfs $mntpoint $nullfsmp
Modified: user/pho/stress2/misc/nullfs14.sh
==============================================================================
--- user/pho/stress2/misc/nullfs14.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nullfs14.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -42,7 +42,7 @@ mount | grep "$mntpoint " | grep -q /dev
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
#chmod 777 $mntpoint
mount -t nullfs $mntpoint $nullfsmp
Modified: user/pho/stress2/misc/nullfs15.sh
==============================================================================
--- user/pho/stress2/misc/nullfs15.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nullfs15.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -43,7 +43,7 @@ mount | grep "$mntpoint " | grep -q /dev
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
mount -t nullfs $mntpoint $nullfsmp
Modified: user/pho/stress2/misc/nullfs7.sh
==============================================================================
--- user/pho/stress2/misc/nullfs7.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nullfs7.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -41,7 +41,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
[ -d $RUNDIR ] || mkdir -p $RUNDIR
Modified: user/pho/stress2/misc/nullfs9.sh
==============================================================================
--- user/pho/stress2/misc/nullfs9.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/nullfs9.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -44,7 +44,7 @@ mount | grep $mnt2 | grep -q /dev/md &&
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mnt2
chmod 777 $mnt2
Modified: user/pho/stress2/misc/parallelmount.sh
==============================================================================
--- user/pho/stress2/misc/parallelmount.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/parallelmount.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -41,7 +41,7 @@ if [ $# -eq 0 ]; then
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 10m -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
- newfs -U md${mdstart}$part > /dev/null
+ newfs $newfs_flags md${mdstart}$part > /dev/null
# start the parallel tests
for i in `jot $parallel`; do
Modified: user/pho/stress2/misc/pread.sh
==============================================================================
--- user/pho/stress2/misc/pread.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/pread.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -72,7 +72,7 @@ done
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 -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
cp -a /usr/include $mntpoint
echo "Testing FFS"
Modified: user/pho/stress2/misc/quota4.sh
==============================================================================
--- user/pho/stress2/misc/quota4.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/quota4.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -43,7 +43,7 @@ mdconfig -l | grep md${mdstart} > /dev/n
mdconfig -a -t vnode -f $D -u ${mdstart}
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null
+newfs $newfs_flags md${mdstart}${part} > /dev/null
echo "/dev/md${mdstart}${part} ${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
Modified: user/pho/stress2/misc/quota9.sh
==============================================================================
--- user/pho/stress2/misc/quota9.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/quota9.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -51,7 +51,7 @@ if [ $# -eq 0 ]; then
mdconfig -a -t vnode -f $D -u ${mdstart}
bsdlabel -w md${mdstart} auto
- newfs -U md${mdstart}${part} > /dev/null
+ newfs $newfs_flags md${mdstart}${part} > /dev/null
echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab
mount ${mntpoint}
mkdir ${mntpoint}/stressX
Modified: user/pho/stress2/misc/rename10.sh
==============================================================================
--- user/pho/stress2/misc/rename10.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/rename10.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -48,7 +48,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 4g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
avail=`df -k $mntpoint | tail -1 | awk '{print $4}'`
Modified: user/pho/stress2/misc/rename5.sh
==============================================================================
--- user/pho/stress2/misc/rename5.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/rename5.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -45,7 +45,7 @@ mdconfig -l | grep -q $mdstart && mdcon
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
here=`pwd`
Modified: user/pho/stress2/misc/rename6.sh
==============================================================================
--- user/pho/stress2/misc/rename6.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/rename6.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -47,7 +47,7 @@ mount | grep $mntpoint | grep -q /dev/md
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 2g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/rename7.sh
==============================================================================
--- user/pho/stress2/misc/rename7.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/rename7.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -49,7 +49,7 @@ mount | grep $mntpoint | grep -q /dev/md
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 2g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/rename8.sh
==============================================================================
--- user/pho/stress2/misc/rename8.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/rename8.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -47,7 +47,7 @@ mount | grep $mntpoint | grep -q /dev/md
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 2g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/rot.sh
==============================================================================
--- user/pho/stress2/misc/rot.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/rot.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -48,7 +48,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 2g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/sendfile5.sh
==============================================================================
--- user/pho/stress2/misc/sendfile5.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/sendfile5.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -55,7 +55,7 @@ umount $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
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
echo "Testing FFS"
cp /tmp/big $mntpoint
Modified: user/pho/stress2/misc/sendfile6.sh
==============================================================================
--- user/pho/stress2/misc/sendfile6.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/sendfile6.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -239,7 +239,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
dd if=/dev/random of=$mntpoint/data bs=123456 count=1 > /dev/null 2>&1
Modified: user/pho/stress2/misc/setuid.sh
==============================================================================
--- user/pho/stress2/misc/setuid.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/setuid.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -46,7 +46,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 2g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
mkdir $mntpoint/root
Modified: user/pho/stress2/misc/sigxcpu.sh
==============================================================================
--- user/pho/stress2/misc/sigxcpu.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/sigxcpu.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -48,7 +48,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 4g -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/snap8.sh
==============================================================================
--- user/pho/stress2/misc/snap8.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/snap8.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -49,7 +49,7 @@ truncate -s ${size}G $diskimage
mdconfig -a -t vnode -f $diskimage -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -O2 -U md${mdstart}${part} > /dev/null
+newfs -O2 $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
Modified: user/pho/stress2/misc/swap2.sh
==============================================================================
--- user/pho/stress2/misc/swap2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/swap2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -42,7 +42,7 @@ mount | grep $mntpoint | grep -q /dev/md
mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
mdconfig -a -t swap -s 2g -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
chmod 777 $mntpoint
Modified: user/pho/stress2/misc/trim2.sh
==============================================================================
--- user/pho/stress2/misc/trim2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/trim2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -40,7 +40,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t malloc -o reserve -s 128m -u $mdstart || exit 1
bsdlabel -w md$mdstart auto
[ $# -eq 0 ] && trim=-t
-newfs $trim -U md${mdstart}$part > /dev/null
+newfs $trim $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
echo "This is a Trim (TRIM) test." >> $mntpoint/file
Modified: user/pho/stress2/misc/truncate3.sh
==============================================================================
--- user/pho/stress2/misc/truncate3.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/truncate3.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -40,7 +40,7 @@ mdconfig -l | grep -q $mdstart && mdcon
mdconfig -a -t swap -s 400m -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}${part} > /dev/null
+newfs $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
export RUNDIR=$mntpoint/stressX
Modified: user/pho/stress2/misc/truncate4.sh
==============================================================================
--- user/pho/stress2/misc/truncate4.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/truncate4.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -40,7 +40,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md$mdstart auto
for size in $((4 * 1024 * 1024 * 1024 - 1)) $((4 * 1024 * 1024 * 1024)); do
- newfs -U md${mdstart}$part > /dev/null
+ newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
echo "Truncate file size: $size"
Modified: user/pho/stress2/misc/truncate5.sh
==============================================================================
--- user/pho/stress2/misc/truncate5.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/truncate5.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -40,7 +40,7 @@ mdconfig -l | grep -q $mdstart && mdcon
mdconfig -a -t swap -s 1g -u $mdstart
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
mount /dev/md${mdstart}$part $mntpoint
here=`pwd`
Modified: user/pho/stress2/misc/umountf5.sh
==============================================================================
--- user/pho/stress2/misc/umountf5.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/umountf5.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -43,7 +43,7 @@ mdconfig -l | grep md${mdstart} > /dev/n
mdconfig -a -t vnode -f $D -u ${mdstart}
bsdlabel -w md${mdstart} auto
-newfs -U md${mdstart}$part > /dev/null 2>&1
+newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1
mount /dev/md${mdstart}$part $mntpoint
export RUNDIR=$mntpoint/stressX
Modified: user/pho/stress2/misc/umountf6.sh
==============================================================================
--- user/pho/stress2/misc/umountf6.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/umountf6.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -50,7 +50,7 @@ if [ $# -eq 0 ]; then
egrep -v "records|transferred"
mdconfig -a -t vnode -f $D$m -u $m
bsdlabel -w md$m auto
- newfs -U md${m}$part > /dev/null 2>&1
+ newfs $newfs_flags md${m}$part > /dev/null 2>&1
done
# start the parallel tests
Modified: user/pho/stress2/misc/vunref2.sh
==============================================================================
--- user/pho/stress2/misc/vunref2.sh Thu Dec 5 07:32:54 2013 (r258967)
+++ user/pho/stress2/misc/vunref2.sh Thu Dec 5 08:20:46 2013 (r258968)
@@ -41,7 +41,7 @@ mdconfig -l | grep -q md$mdstart && mdc
mdconfig -a -t swap -s 12m -u $mdstart
bsdlabel -w md$mdstart auto
-newfs -U md${mdstart}${part} > /dev/null
+newfs $newfs_flags md${mdstart}${part} > /dev/null
mount /dev/md${mdstart}${part} $mntpoint
chmod 777 ${mntpoint}
More information about the svn-src-user
mailing list