svn commit: r204804 -
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Pawel Jakub Dawidek
pjd at FreeBSD.org
Sat Mar 6 20:03:27 UTC 2010
Author: pjd
Date: Sat Mar 6 20:03:26 2010
New Revision: 204804
URL: http://svn.freebsd.org/changeset/base/204804
Log:
Remove racy assertion.
Reported by: Attila Nagy <bra at fsn.hu>
Obtained from: OpenSolaris, Bug ID 6827260
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Mar 6 19:21:57 2010 (r204803)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Mar 6 20:03:26 2010 (r204804)
@@ -2502,7 +2502,6 @@ arc_read(zio_t *pio, spa_t *spa, blkptr_
uint32_t *arc_flags, const zbookmark_t *zb)
{
int err;
- arc_buf_hdr_t *hdr = pbuf->b_hdr;
ASSERT(!refcount_is_zero(&pbuf->b_hdr->b_refcnt));
ASSERT3U((char *)bp - (char *)pbuf->b_data, <, pbuf->b_hdr->b_size);
@@ -2511,8 +2510,8 @@ arc_read(zio_t *pio, spa_t *spa, blkptr_
err = arc_read_nolock(pio, spa, bp, done, private, priority,
zio_flags, arc_flags, zb);
- ASSERT3P(hdr, ==, pbuf->b_hdr);
rw_exit(&pbuf->b_lock);
+
return (err);
}
More information about the svn-src-all
mailing list