From owner-svn-src-user@freebsd.org  Mon Oct 24 07:58:16 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1356C1F2EB
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 24 Oct 2016 07:58:16 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 83C3C1660;
 Mon, 24 Oct 2016 07:58:16 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9O7wFfD009165;
 Mon, 24 Oct 2016 07:58:15 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9O7wFc3009164;
 Mon, 24 Oct 2016 07:58:15 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201610240758.u9O7wFc3009164@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 24 Oct 2016 07:58:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r307851 - 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.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Oct 2016 07:58:16 -0000

Author: pho
Date: Mon Oct 24 07:58:15 2016
New Revision: 307851
URL: https://svnweb.freebsd.org/changeset/base/307851

Log:
  Style fixes. Added missing cleanup on error exit.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/umountf.sh
==============================================================================
--- user/pho/stress2/misc/umountf.sh	Mon Oct 24 07:56:20 2016	(r307850)
+++ user/pho/stress2/misc/umountf.sh	Mon Oct 24 07:58:15 2016	(r307851)
@@ -37,18 +37,18 @@
 D=$diskimage
 dede $D 1m 110 || exit 1
 
-mount | grep "$mntpoint" | grep md${mdstart}${part} > /dev/null && umount $mntpoint
-mdconfig -l | grep md${mdstart} > /dev/null &&  mdconfig -d -u ${mdstart}
-
-mdconfig -a -t vnode -f $D -u ${mdstart}
-bsdlabel -w md${mdstart} auto
-newfs md${mdstart}${part}
-mount /dev/md${mdstart}${part} $mntpoint
+mount | grep "$mntpoint" | grep md${mdstart}${part} > /dev/null &&
+    umount $mntpoint
+mdconfig -l | grep md$mdstart > /dev/null &&  mdconfig -d -u $mdstart
+
+mdconfig -a -t vnode -f $D -u $mdstart || { rm $diskimage; exit 1; }
+bsdlabel -w md$mdstart auto
+newfs md${mdstart}$part > /dev/null
+mount /dev/md${mdstart}$part $mntpoint
 
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=2m
 cd ..; ./run.sh vfs.cfg > /dev/null 2>&1 &
-pid=$!
 
 sleep 30
 
@@ -56,7 +56,7 @@ umount -f $mntpoint
 mdconfig -d -u $mdstart
 rm -f $D
 
-while ps | egrep "testcases|swap|mkdir|creat" | grep -vq grep; do
-   ps | egrep "testcases|swap|mkdir|creat" | grep -v grep | awk '{print $1}' | xargs kill
-   sleep 1
+while pkill -f "swap|mkdir|creat"; do
+	sleep 1
 done
+wait