From owner-svn-src-head@FreeBSD.ORG  Mon Nov 17 11:35:30 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BD1EB3D2;
 Mon, 17 Nov 2014 11:35:30 +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 A9AB584F;
 Mon, 17 Nov 2014 11:35:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHBZU3k007331;
 Mon, 17 Nov 2014 11:35:30 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHBZUKm007330;
 Mon, 17 Nov 2014 11:35:30 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201411171135.sAHBZUKm007330@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland <smh@FreeBSD.org>
Date: Mon, 17 Nov 2014 11:35:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274620 - head/tools/regression/zfs/zpool/add
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Nov 2014 11:35:30 -0000

Author: smh
Date: Mon Nov 17 11:35:30 2014
New Revision: 274620
URL: https://svnweb.freebsd.org/changeset/base/274620

Log:
  Revert r273630 as the panic was fixed by r274619
  
  The panic was caused by TRIM requests run against file based vdevs as write
  requests.
  
  PR:		191573
  Sponsored by:	Multiplay

Modified:
  head/tools/regression/zfs/zpool/add/files.t

Modified: head/tools/regression/zfs/zpool/add/files.t
==============================================================================
--- head/tools/regression/zfs/zpool/add/files.t	Mon Nov 17 11:32:10 2014	(r274619)
+++ head/tools/regression/zfs/zpool/add/files.t	Mon Nov 17 11:35:30 2014	(r274620)
@@ -4,8 +4,6 @@
 dir=`dirname $0`
 . ${dir}/../../misc.sh
 
-[ "${os}" = "FreeBSD" ] && die "panics FreeBSD; see bug # 191573"
-
 echo "1..54"
 
 files_create 8