From owner-svn-src-head@FreeBSD.ORG Fri Mar 12 12:11:02 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1134A106564A; Fri, 12 Mar 2010 12:11:02 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (chello089077043238.chello.pl [89.77.43.238]) by mx1.freebsd.org (Postfix) with ESMTP id 4EDD58FC18; Fri, 12 Mar 2010 12:11:00 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id E9A4745E87; Fri, 12 Mar 2010 13:10:58 +0100 (CET) Received: from localhost (pdawidek.wheel.pl [10.0.1.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 5E91145CA0; Fri, 12 Mar 2010 13:10:53 +0100 (CET) Date: Fri, 12 Mar 2010 13:10:53 +0100 From: Pawel Jakub Dawidek To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <20100312121053.GH1819@garage.freebsd.pl> References: <201003121207.o2CC7L0V093515@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bjuZg6miEcdLYP6q" Content-Disposition: inline In-Reply-To: <201003121207.o2CC7L0V093515@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT i386 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-5.9 required=4.5 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.0.4 Cc: Subject: Re: svn commit: r205079 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Mar 2010 12:11:02 -0000 --bjuZg6miEcdLYP6q Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 12, 2010 at 12:07:21PM +0000, Pawel Jakub Dawidek wrote: > Author: pjd > Date: Fri Mar 12 12:07:21 2010 > New Revision: 205079 > URL: http://svn.freebsd.org/changeset/base/205079 >=20 > Log: > Remove bogus assertion. > =20 > Reported by: Johan Str=F6m > Obtained from: OpenSolaris, Bug ID 6827260 Grr, it was bug 6920880. Unfortunately no forced commits in subversion. > MFC after: 1 week >=20 > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c >=20 > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Fri Mar 12= 11:05:37 2010 (r205078) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c Fri Mar 12= 12:07:21 2010 (r205079) > @@ -2210,9 +2210,6 @@ dbuf_write_ready(zio_t *zio, arc_buf_t * > for (i =3D db->db.db_size >> SPA_BLKPTRSHIFT; i > 0; i--, ibp++) { > if (BP_IS_HOLE(ibp)) > continue; > - ASSERT3U(BP_GET_LSIZE(ibp), =3D=3D, > - db->db_level =3D=3D 1 ? dn->dn_datablksz : > - (1<dn_phys->dn_indblkshift)); > fill +=3D ibp->blk_fill; > } > } --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --bjuZg6miEcdLYP6q Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkuaL00ACgkQForvXbEpPzT7DwCgpn4JmbqZyhp1DCRmQYKzigcg Eq8An1HhXoFnYqo870kF4Jo+6PpRHNaF =wkdj -----END PGP SIGNATURE----- --bjuZg6miEcdLYP6q--