From owner-svn-src-vendor@FreeBSD.ORG Tue Jun 11 18:43:26 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 66ABFB73; Tue, 11 Jun 2013 18:43:26 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 588EC145B; Tue, 11 Jun 2013 18:43:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BIhP93047639; Tue, 11 Jun 2013 18:43:25 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BIhPSX047638; Tue, 11 Jun 2013 18:43:25 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201306111843.r5BIhPSX047638@svn.freebsd.org> From: Xin LI Date: Tue, 11 Jun 2013 18:43:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r251624 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/ztest X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jun 2013 18:43:26 -0000 Author: delphij Date: Tue Jun 11 18:43:25 2013 New Revision: 251624 URL: http://svnweb.freebsd.org/changeset/base/251624 Log: Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 14050:0c8d9998d589 Illumos ZFS issues: 3747 txg commit callbacks don't work Modified: vendor/illumos/dist/cmd/ztest/ztest.c Changes in other areas also in this revision: Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/txg.c Modified: vendor/illumos/dist/cmd/ztest/ztest.c ============================================================================== --- vendor/illumos/dist/cmd/ztest/ztest.c Tue Jun 11 18:39:38 2013 (r251623) +++ vendor/illumos/dist/cmd/ztest/ztest.c Tue Jun 11 18:43:25 2013 (r251624) @@ -4507,7 +4507,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *z */ tmp_cb = list_head(&zcl.zcl_callbacks); if (tmp_cb != NULL && - tmp_cb->zcd_txg > txg - ZTEST_COMMIT_CALLBACK_THRESH) { + (txg - ZTEST_COMMIT_CALLBACK_THRESH) > tmp_cb->zcd_txg) { fatal(0, "Commit callback threshold exceeded, oldest txg: %" PRIu64 ", open txg: %" PRIu64 "\n", tmp_cb->zcd_txg, txg); }