From owner-svn-src-user@freebsd.org  Sat Dec 23 13:10:37 2017
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 7F7C3EA5646
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sat, 23 Dec 2017 13:10:37 +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 4CC8935E4;
 Sat, 23 Dec 2017 13:10:37 +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 vBNDAaAV069362;
 Sat, 23 Dec 2017 13:10:36 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBNDAaVp069361;
 Sat, 23 Dec 2017 13:10:36 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201712231310.vBNDAaVp069361@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: Sat, 23 Dec 2017 13:10:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r327105 - 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: 327105
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 &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: Sat, 23 Dec 2017 13:10:37 -0000

Author: pho
Date: Sat Dec 23 13:10:36 2017
New Revision: 327105
URL: https://svnweb.freebsd.org/changeset/base/327105

Log:
  kldunload was never executed. Fix this.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/crossmp7.sh
==============================================================================
--- user/pho/stress2/misc/crossmp7.sh	Sat Dec 23 12:44:24 2017	(r327104)
+++ user/pho/stress2/misc/crossmp7.sh	Sat Dec 23 13:10:36 2017	(r327105)
@@ -75,6 +75,7 @@ if [ $# -eq 0 ]; then
 	wait
 
 	zpool destroy stress2_tank
+	[ -n "$loaded" ] && kldunload zfs.ko
 	mdconfig -d -u $u1
 	mdconfig -d -u $u2
 	mdconfig -d -u $u3
@@ -94,4 +95,3 @@ else
 		rm -f /tmp/crossmp7.continue
 	fi
 fi
-[ -n "$loaded" ] && kldunload zfs.ko