From owner-svn-src-user@FreeBSD.ORG  Tue Dec 10 09:50:33 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B317ACD9;
 Tue, 10 Dec 2013 09:50:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F7C1186F;
 Tue, 10 Dec 2013 09:50:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBA9oXGU070421;
 Tue, 10 Dec 2013 09:50:33 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBA9oXpW070420;
 Tue, 10 Dec 2013 09:50:33 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312100950.rBA9oXpW070420@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 10 Dec 2013 09:50:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259163 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 09:50:33 -0000

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.?