From owner-svn-src-user@freebsd.org Wed Apr 18 11:24:58 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D6C7F811F2 for ; Wed, 18 Apr 2018 11:24:58 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B5107731EE; Wed, 18 Apr 2018 11:24:57 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B02521A57C; Wed, 18 Apr 2018 11:24:57 +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 w3IBOvDH004618; Wed, 18 Apr 2018 11:24:57 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3IBOvTK004617; Wed, 18 Apr 2018 11:24:57 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201804181124.w3IBOvTK004617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 18 Apr 2018 11:24:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332665 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 332665 X-SVN-Commit-Repository: base 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.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2018 11:24:58 -0000 Author: pho Date: Wed Apr 18 11:24:57 2018 New Revision: 332665 URL: https://svnweb.freebsd.org/changeset/base/332665 Log: Style changes only. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/crossmp.sh Modified: user/pho/stress2/misc/crossmp.sh ============================================================================== --- user/pho/stress2/misc/crossmp.sh Wed Apr 18 11:02:19 2018 (r332664) +++ user/pho/stress2/misc/crossmp.sh Wed Apr 18 11:24:57 2018 (r332665) @@ -44,8 +44,9 @@ if [ $# -eq 0 ]; then for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) [ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m - mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m - mdconfig -l | grep -q md$m && mdconfig -d -u $m + mount | grep "on ${mntpoint}$m " | grep -q md$m && + umount ${mntpoint}$m + mdconfig -l | grep -q md$m && mdconfig -d -u $m dede $D$m 1m 1 mdconfig -a -t vnode -f $D$m -u $m @@ -67,7 +68,7 @@ if [ $# -eq 0 ]; then mdconfig -d -u $m rm -f $D$m done - + exit 0 else if [ $1 = find ]; then while [ -r $cont ]; do @@ -79,8 +80,9 @@ else for i in `jot 1024`; do m=$1 mount /dev/md${m}$part ${mntpoint}$m - while mount | grep -qw $mntpoint$m; do - opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") + while mount | grep -q "on ${mntpoint}$m "; do + opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && + echo "-f") umount $opt ${mntpoint}$m > /dev/null 2>&1 done done