From owner-svn-src-projects@FreeBSD.ORG  Mon Mar  1 09:39:14 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA297106566B;
	Mon,  1 Mar 2010 09:39:14 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A95EF8FC08;
	Mon,  1 Mar 2010 09:39:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o219dE3r059705;
	Mon, 1 Mar 2010 09:39:14 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o219dEqm059703;
	Mon, 1 Mar 2010 09:39:14 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201003010939.o219dEqm059703@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 1 Mar 2010 09:39:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204510 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 09:39:14 -0000

Author: pho
Date: Mon Mar  1 09:39:14 2010
New Revision: 204510
URL: http://svn.freebsd.org/changeset/base/204510

Log:
  Updated the scenario. Switched from vnode backed MD FS to swap backed.

Modified:
  projects/stress2/misc/msdos.sh

Modified: projects/stress2/misc/msdos.sh
==============================================================================
--- projects/stress2/misc/msdos.sh	Mon Mar  1 07:32:49 2010	(r204509)
+++ projects/stress2/misc/msdos.sh	Mon Mar  1 09:39:14 2010	(r204510)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
+# Copyright (c) 2008-2010 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,32 +30,24 @@
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
-# Causes this: panic: mutex Giant not owned at ../../../kern/vfs_subr.c:1968
-# with a kernel compiled with "options QUOTA"
+# LOR seen. Fixed by r204467.
 
 . ../default.cfg
 
-unmount() {
-	while mount | grep $mntpoint | grep -q md${mdstart}; do
-		umount $mntpoint > /dev/null 2>&1
-	done
-}
-
-D=$diskimage
-dede $D 1m 128 || exit 
-
-unmount
-mdconfig -l | grep ${mdstart} > /dev/null &&  mdconfig -d -u $mdstart
-
-mdconfig -a -t vnode -f $D -u $mdstart
+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
-newfs_msdos -F 16 -b 8192 /dev/md${mdstart}a
+newfs_msdos /dev/md${mdstart}a > /dev/null
 mount -t msdosfs /dev/md${mdstart}a $mntpoint
-df -h $mntpoint
+
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=10m            # Run tests for 10 minutes
-(cd /home/pho/stress2; ./run.sh disk.cfg) 
-unmount
+(cd ..; ./run.sh disk.cfg) 
+
+while mount | grep "$mntpoint" | grep -q md$mdstart; do
+	umount $mntpoint || sleep 1
+done
+fsck -t msdosfs -y /dev/md${mdstart}a
 mdconfig -d -u $mdstart
-rm -f $D