svn commit: r205079 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Pawel Jakub Dawidek]

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
> 
> Log:
>   Remove bogus assertion.
>   
>   Reported by:	Johan Ström <johan at stromnet.se>
>   Obtained from:	OpenSolaris, Bug ID 6827260

Grr, it was bug 6920880. Unfortunately no forced commits in subversion.

>   MFC after:	1 week
> 
> Modified:
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
> 
> Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
> ==============================================================================
> --- 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 = db->db.db_size >> SPA_BLKPTRSHIFT; i > 0; i--, ibp++) {
>  			if (BP_IS_HOLE(ibp))
>  				continue;
> -			ASSERT3U(BP_GET_LSIZE(ibp), ==,
> -			    db->db_level == 1 ? dn->dn_datablksz :
> -			    (1<<dn->dn_phys->dn_indblkshift));
>  			fill += ibp->blk_fill;
>  		}
>  	}

-- 
Pawel Jakub Dawidek                       http://www.wheelsystems.com
pjd at FreeBSD.org                           http://www.FreeBSD.org
FreeBSD committer                         Am I Evil? Yes, I Am!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20100312/764e22fd/attachment.pgp