From owner-svn-src-user@freebsd.org  Mon Oct 24 07:52:05 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 53616C1F144
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 24 Oct 2016 07:52:05 +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 235A71165;
 Mon, 24 Oct 2016 07:52:05 +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 u9O7q49C008818;
 Mon, 24 Oct 2016 07:52:04 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9O7q4ub008817;
 Mon, 24 Oct 2016 07:52:04 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201610240752.u9O7q4ub008817@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:52:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r307848 - 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:52:05 -0000

Author: pho
Date: Mon Oct 24 07:52:04 2016
New Revision: 307848
URL: https://svnweb.freebsd.org/changeset/base/307848

Log:
  Only load and unload geom_nop, if not already loaded.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/gnop.sh
==============================================================================
--- user/pho/stress2/misc/gnop.sh	Mon Oct 24 07:50:40 2016	(r307847)
+++ user/pho/stress2/misc/gnop.sh	Mon Oct 24 07:52:04 2016	(r307848)
@@ -59,11 +59,13 @@ test() {
 	mdconfig -d -u $mdstart
 }
 
-gnop load
+kldstat | grep -q geom_nop || { gnop load 2>/dev/null || exit 0 &&
+    notloaded=1; }
 gnop status || exit
 
 for i in 1k 2k 4k 8k; do
 	test $i
 done
 
-gnop unload
+[ $notloaded ] && gnop unload
+exit 0