From owner-svn-src-user@FreeBSD.ORG  Mon Nov  2 00:41:10 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A86C0106566C;
	Mon,  2 Nov 2009 00:41:10 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97BF88FC08;
	Mon,  2 Nov 2009 00:41:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA20fAsc039961;
	Mon, 2 Nov 2009 00:41:10 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA20fAWS039959;
	Mon, 2 Nov 2009 00:41:10 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911020041.nA20fAWS039959@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 2 Nov 2009 00:41:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198779 -
	user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Nov 2009 00:41:10 -0000

Author: kmacy
Date: Mon Nov  2 00:41:10 2009
New Revision: 198779
URL: http://svn.freebsd.org/changeset/base/198779

Log:
  avoid doing KASSERT with null bp

Modified:
  user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Nov  2 00:26:56 2009	(r198778)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Nov  2 00:41:10 2009	(r198779)
@@ -1314,7 +1314,12 @@ arc_getblk(arc_buf_t *buf)
 		tbuf = buf;
 		vp = spa_get_vnode(spa);
 
-		bcopy(buf->b_bp->b_data, newbp->b_data, size);
+		bp = buf->b_bp;
+		bcopy(bp->b_data, newbp->b_data, size);
+		KASSERT((bp->b_blkno == bp->b_lblkno) &&
+		    (bp->b_blkno == blkno),
+		    ("blkno mismatch b_blkno %ld b_lblkno %ld blkno %ld",
+			bp->b_blkno, bp->b_lblkno, blkno));
 		while (tbuf->b_next != NULL) {
 			if (tbuf->b_bp->b_vp != NULL) {
 				KASSERT((bp->b_xflags & (BX_VNCLEAN|BX_VNDIRTY)) == BX_VNCLEAN, ("brelvp() on buffer that is not in splay"));
@@ -1328,10 +1333,6 @@ arc_getblk(arc_buf_t *buf)
 			tbuf = tbuf->b_next;
 		}
 
-		KASSERT((bp->b_blkno == bp->b_lblkno) &&
-		    (bp->b_blkno == blkno),
-		    ("blkno mismatch b_blkno %ld b_lblkno %ld blkno %ld",
-			bp->b_blkno, bp->b_lblkno, blkno));
 		newbp->b_bufobj = &vp->v_bufobj;
 		newbp->b_lblkno = blkno;
 		newbp->b_blkno = blkno;