Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 12 Mar 2010 13:10:53 +0100
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r205079 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Message-ID:  <20100312121053.GH1819@garage.freebsd.pl>
In-Reply-To: <201003121207.o2CC7L0V093515@svn.freebsd.org>
References:  <201003121207.o2CC7L0V093515@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help 

--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 <johan@stromnet.se>
>   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->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--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100312121053.GH1819>