From owner-svn-src-user@FreeBSD.ORG  Sun Nov  8 21:31:36 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 D1ED1106566B;
	Sun,  8 Nov 2009 21:31:36 +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 C124F8FC14;
	Sun,  8 Nov 2009 21:31:36 +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 nA8LVagj098611;
	Sun, 8 Nov 2009 21:31:36 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA8LVaQD098609;
	Sun, 8 Nov 2009 21:31:36 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911082131.nA8LVaQD098609@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 8 Nov 2009 21:31:36 +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: r199063 -
	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: Sun, 08 Nov 2009 21:31:36 -0000

Author: kmacy
Date: Sun Nov  8 21:31:36 2009
New Revision: 199063
URL: http://svn.freebsd.org/changeset/base/199063

Log:
  - don't call BUF_KERNPROC if newbp is not set
  - don't try to print bp->b_flags if bp is NULL

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	Sun Nov  8 21:08:50 2009	(r199062)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Nov  8 21:31:36 2009	(r199063)
@@ -1381,7 +1381,8 @@ arc_getblk(arc_buf_t *buf)
 	    newbp, newbp->b_flags);
 #endif
 
-	BUF_KERNPROC(newbp);
+	if (newbp != NULL)
+		BUF_KERNPROC(newbp);
 	buf->b_bp = newbp;
 	buf->b_data = data;
 }
@@ -3424,7 +3425,7 @@ arc_write_done(zio_t *zio)
 		off_t blkno = hdr->b_dva.dva_word[1] & ~(1UL<<63);	
 
 		CTR3(KTR_SPARE2, "arc_write_done() bp=%p flags %X blkno %ld",
-		    bp, bp->b_flags, blkno);
+		    bp, bp ? bp->b_flags : 0, blkno);
 
 		arc_cksum_verify(buf);