From owner-svn-src-user@FreeBSD.ORG  Tue Feb  3 18:33:24 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DD704EF;
 Tue,  3 Feb 2015 18:33:24 +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 5B14D9D;
 Tue,  3 Feb 2015 18:33:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13IXOPo081417;
 Tue, 3 Feb 2015 18:33:24 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13IXOwY081416;
 Tue, 3 Feb 2015 18:33:24 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201502031833.t13IXOwY081416@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:33:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r278162 - 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:33:24 -0000

Author: pho
Date: Tue Feb  3 18:33:23 2015
New Revision: 278162
URL: https://svnweb.freebsd.org/changeset/base/278162

Log:
  Use mount points based on $mntpoint.
  
  Sponsored by:	 EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/nbufkv.sh
==============================================================================
--- user/pho/stress2/misc/nbufkv.sh	Tue Feb  3 16:17:54 2015	(r278161)
+++ user/pho/stress2/misc/nbufkv.sh	Tue Feb  3 18:33:23 2015	(r278162)
@@ -49,8 +49,10 @@ u1=$mdstart
 u2=$((u1 + 1))
 d1=/tmp/diskimage1
 d2=/tmp/diskimage2
-[ -d mp1 ] || mkdir mp1
-[ -d mp2 ] || mkdir mp2
+mp1=$mntpoint
+mp2=${mntpoint}2
+[ -d $mp1 ] || mkdir $mp1
+[ -d $mp2 ] || mkdir $mp2
 truncate -s 20g $d1
 truncate -s 20g $d2
 
@@ -61,17 +63,17 @@ mdconfig -l | grep -q md${u1} && mdconfi
 
 mdconfig -a -t vnode -f $d1 -u $u1
 bsdlabel -w md$u1 auto
-newfs -b 65536 -f 65536 -O2 md${u1}${part} > /dev/null
+newfs -b 65536 -f 65536 -O2 md${u1}$part > /dev/null
 
 mdconfig -a -t vnode -f $d2 -u $u2
 bsdlabel -w md$u2 auto
-newfs -b 65536 -f 65536 -O2 md${u2}${part} > /dev/null
+newfs -b 65536 -f 65536 -O2 md${u2}$part > /dev/null
 
-mount /dev/md${u1}$part mp1
-mount /dev/md${u2}$part mp2
+mount /dev/md${u1}$part $mp1
+mount /dev/md${u2}$part $mp2
 
-/tmp/nbufkv `pwd`/mp1 &
-/tmp/nbufkv `pwd`/mp2 &
+/tmp/nbufkv /$mp1 &
+/tmp/nbufkv /$mp2 &
 wait;wait
 
 umount /dev/md${u2}$part
@@ -83,7 +85,7 @@ mount | grep -q /dev/md${u1}$part && umo
 mdconfig -d -u $u2
 mdconfig -d -u $u1
 
-rm -rf mp1 mp2 $d1 $d2 /tmp/nbufkv
+rm -rf $d1 $d2 /tmp/nbufkv
 exit
 EOF
 #include <sys/types.h>
@@ -122,7 +124,7 @@ main(int argc, char **argv)
 
 	sprintf(path, "%s/nbufkv.%06d", argv[1], getpid());
 	if ((fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0640)) == -1)
-		err(1,"open()");
+		err(1,"open(%s)", path);
 	if (ftruncate(fd, len) == -1)
 		err(1, "ftruncate");