svn commit: r259163 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Tue Dec 10 09:50:33 2013
New Revision: 259163
URL: http://svnweb.freebsd.org/changeset/base/259163

Log:
  No need to use tunefs. Use file system check defined in default.cfg.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/trim4.sh

Modified: user/pho/stress2/misc/trim4.sh
==============================================================================
--- user/pho/stress2/misc/trim4.sh	Tue Dec 10 09:48:10 2013	(r259162)
+++ user/pho/stress2/misc/trim4.sh	Tue Dec 10 09:50:33 2013	(r259163)
@@ -35,14 +35,12 @@
 
 . ../default.cfg
 
-tunefs -? 2>&1 | grep "j enable" || exit 1
-
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 size="1g"
 [ $# -eq 0 ] && trim=-t
-flag="-U"
+flag="-j"
 for i in `jot 6`; do
 	echo "Test #$i `date '+%T'`"
 	echo "mdconfig -a -t swap -s $size -u $mdstart"
@@ -51,7 +49,6 @@ for i in `jot 6`; do
 
 	echo "newfs $trim $flag md${mdstart}$part"
 	newfs $trim $flag md${mdstart}$part > /dev/null
-	tunefs -j enable /dev/md${mdstart}$part
 
 	mount /dev/md${mdstart}$part $mntpoint
 	chmod 777 $mntpoint
@@ -64,16 +61,6 @@ for i in `jot 6`; do
 	while mount | grep $mntpoint | grep -q /dev/md; do
 		umount $mntpoint || sleep 1
 	done
-	dumpfs /dev/md${mdstart}$part > /tmp/dumpfs.1
-	sleep 1
-	fsck -t ufs -y /dev/md${mdstart}$part > /tmp/fsck.log 2>&1
-	dumpfs /dev/md${mdstart}$part > /tmp/dumpfs.2
-
-	if grep -q "FALLBACK TO FULL FSCK" /tmp/fsck.log; then
-		diff -c /tmp/dumpfs.1 /tmp/dumpfs.2
-		cat /tmp/fsck.log
-		exit 1
-	fi
+	checkfs /dev/md${mdstart}$part
 	mdconfig -d -u $mdstart
 done
-rm -f /tmp/fsck.log /tmp/dumpfs.?