From owner-svn-src-user@FreeBSD.ORG  Tue Feb  3 18:45:44 2015
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A2C88949;
 Tue,  3 Feb 2015 18:45:44 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 902F1165;
 Tue,  3 Feb 2015 18:45:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Iji7j007257;
 Tue, 3 Feb 2015 18:45:44 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Ijidq007256;
 Tue, 3 Feb 2015 18:45:44 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201502031845.t13Ijidq007256@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 3 Feb 2015 18:45:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r278164 - 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.18-1
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, 03 Feb 2015 18:45:44 -0000

Author: pho
Date: Tue Feb  3 18:45:43 2015
New Revision: 278164
URL: https://svnweb.freebsd.org/changeset/base/278164

Log:
  Fix trailing whitespace. Improve unmount code.
  
  Sponsored by:	 EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/pfl.sh
==============================================================================
--- user/pho/stress2/misc/pfl.sh	Tue Feb  3 18:42:28 2015	(r278163)
+++ user/pho/stress2/misc/pfl.sh	Tue Feb  3 18:45:43 2015	(r278164)
@@ -48,7 +48,7 @@ md1=$mdstart
 md2=$((mdstart + 1))
 
 opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-j" || echo "-U")
-mount | grep $mp1 | grep -q /dev/md && umount -f $mp1
+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 2g -u $md1
 bsdlabel -w md$md1 auto
@@ -56,7 +56,7 @@ newfs $opt md${md1}$part > /dev/null
 mount /dev/md${md1}$part $mp1
 chmod 777 $mp1
 
-mount | grep $mp2 | grep -q /dev/md && umount -f $mp2
+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 2g -u $md2
 bsdlabel -w md$md2 auto
@@ -127,7 +127,7 @@ test(void)
 		sprintf(file,"p%05d.%05d", pid, i);
 		if (unlink(file) == -1)
 			err(3, "unlink(%s)", file);
-		
+
 	}
 	chdir("..");
 	sprintf(file,"d%05d", pid);
@@ -152,7 +152,7 @@ main(void)
 				exit(0);
 			}
 		}
-		
+
 		for (j = 0; j < PARALLEL; j++)
 			wait(NULL);