From owner-svn-src-user@FreeBSD.ORG  Sun Aug 30 23:16:52 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 869651065703;
	Sun, 30 Aug 2009 23:16:52 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 75C4B8FC08;
	Sun, 30 Aug 2009 23:16:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7UNGqAD009421;
	Sun, 30 Aug 2009 23:16:52 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7UNGq6l009419;
	Sun, 30 Aug 2009 23:16:52 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908302316.n7UNGq6l009419@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 30 Aug 2009 23:16:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196677 -
	user/kmacy/head_zfs_merge/cddl/contrib/opensolaris/cmd/ztest
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Aug 2009 23:16:52 -0000

Author: kmacy
Date: Sun Aug 30 23:16:52 2009
New Revision: 196677
URL: http://svn.freebsd.org/changeset/base/196677

Log:
  merge 193010
  
  update ztest for new zil_replay

Modified:
  user/kmacy/head_zfs_merge/cddl/contrib/opensolaris/cmd/ztest/ztest.c

Modified: user/kmacy/head_zfs_merge/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- user/kmacy/head_zfs_merge/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Sun Aug 30 22:52:18 2009	(r196676)
+++ user/kmacy/head_zfs_merge/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Sun Aug 30 23:16:52 2009	(r196677)
@@ -1304,7 +1304,7 @@ ztest_dmu_objset_create_destroy(ztest_ar
 	if (ztest_random(2) == 0 &&
 	    dmu_objset_open(name, DMU_OST_OTHER, DS_MODE_OWNER, &os) == 0) {
 		zr.zr_os = os;
-		zil_replay(os, &zr, &zr.zr_assign, ztest_replay_vector, NULL);
+		zil_replay(os, &zr, ztest_replay_vector);
 		dmu_objset_close(os);
 	}
 
@@ -3321,8 +3321,7 @@ ztest_run(char *pool)
 			if (test_future)
 				ztest_dmu_check_future_leak(&za[t]);
 			zr.zr_os = za[d].za_os;
-			zil_replay(zr.zr_os, &zr, &zr.zr_assign,
-			    ztest_replay_vector, NULL);
+			zil_replay(zr.zr_os, &zr, ztest_replay_vector);
 			za[d].za_zilog = zil_open(za[d].za_os, NULL);
 		}