From owner-freebsd-current@FreeBSD.ORG  Mon Oct 14 12:10:42 2013
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 433FF81E;
 Mon, 14 Oct 2013 12:10:42 +0000 (UTC)
 (envelope-from kwhite@site.uottawa.ca)
Received: from courriel.site.uottawa.ca (eecsmail.engineering.uottawa.ca
 [137.122.24.224])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 00B18223F;
 Mon, 14 Oct 2013 12:10:41 +0000 (UTC)
Received: from [10.0.2.15] (dsl-66-225-161-151.vianet.ca [66.225.161.151])
 (authenticated bits=0)
 by courriel.site.uottawa.ca (8.14.5/8.14.4) with ESMTP id r9ECAcNg091518
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Mon, 14 Oct 2013 08:10:39 -0400 (EDT)
 (envelope-from kwhite@site.uottawa.ca)
Date: Mon, 14 Oct 2013 08:10:41 -0400 (EDT)
From: Keith White <kwhite@site.uottawa.ca>
X-X-Sender: kwhite@localhost.my.domain
To: Andriy Gapon <avg@FreeBSD.org>
Subject: Re: ZFS panic (dn->dn_datablkshift != 0) with r256304 and
 send/recv
In-Reply-To: <525B797C.4050500@FreeBSD.org>
Message-ID: <alpine.BSF.2.00.1310140808410.2365@localhost.my.domain>
References: <alpine.BSF.2.00.1310132013330.1414@localhost.my.domain>
 <525B797C.4050500@FreeBSD.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: freebsd-current@FreeBSD.org
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 12:10:42 -0000

On Mon, 14 Oct 2013, Andriy Gapon wrote:

> on 14/10/2013 03:34 Keith White said the following:
>> I get the following assert failure with a recent current:
>>
>> panic: solaris assert: dn->dn_datablkshift != 0, file:
>> /usr/src/sys/modules/zfs/../../cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c,
>> line: 638
>
> Please see https://www.illumos.org/issues/4188
> The current best known fix is to simply drop the assertion.
> ...

Thanks!  It works for me.   Receive completes, and filesystems compare the same.

Index: /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
===================================================================
--- /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c    (revision 256304)
+++ /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c    (working copy)
@@ -635,7 +635,7 @@
                 uint64_t start = off >> shift;
                 uint64_t end = (off + len) >> shift;

-               ASSERT(dn->dn_datablkshift != 0);
+               /* XXX may be false alarm: ASSERT(dn->dn_datablkshift != 0); XXX */
                 ASSERT(dn->dn_indblkshift != 0);

                 zio = zio_root(tx->tx_pool->dp_spa,

> Though, I am not entirely sure if this will be the final solution.  I'll
> double-check with Matt.
>

...keith