Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 03 Sep 2019 14:06:01 -0000
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r345760 - user/pho/stress2/misc
Message-ID:  <201904010746.x317kf3d036254@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pho
Date: Mon Apr  1 07:46:41 2019
New Revision: 345760
URL: https://svnweb.freebsd.org/changeset/base/345760

Log:
  Fix the broken "mount -u".
  Style.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/mountro.sh
==============================================================================
--- user/pho/stress2/misc/mountro.sh	Sun Mar 31 23:18:12 2019	(r345759)
+++ user/pho/stress2/misc/mountro.sh	Mon Apr  1 07:46:41 2019	(r345760)
@@ -28,16 +28,15 @@
 # $FreeBSD$
 #
 
-
 . ../default.cfg
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 D=$diskimage
-dede $D 1m 128 || exit
+dd if=/dev/zero of=$D bs=1m count=128 status=none || exit 1
 
-mount | grep "$mntpoint"    | grep -q /md  && umount -f $mntpoint
-mdconfig -l | grep -q $mdstart  &&  mdconfig -d -u $mdstart
+mount | grep "$mntpoint " | grep -q /md && umount -f $mntpoint
+mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart
 
 mdconfig -a -t vnode -f $D -u $mdstart || { rm -f $D; exit 1; }
 
@@ -51,18 +50,17 @@ chmod 777 $mntpoint/stressX
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=4m
 (cd ..; ./run.sh disk.cfg > /dev/null 2>&1) &
-sleep 30
+sleep 10
 
 for i in `jot 10`; do
-	mount $mntpoint -u -o ro > /dev/null 2>&1
+	mount -u -o ro $mntpoint
 	sleep 3
-	mount $mntpoint -u -o rw > /dev/null 2>&1
+	mount -u -o rw $mntpoint
 	sleep 3
-done
-df -i $mntpoint
+done > /dev/null 2>&1
 
-umount -f $mntpoint    > /dev/null 2>&1
+umount -f $mntpoint
 mdconfig -d -u $mdstart
 rm -f $D
-kill `ps -x | grep run.sh | grep -v grep | awk '{print $1}'`
+pkill run.sh
 wait





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904010746.x317kf3d036254>