Date: Sun, 8 Nov 2009 21:31:36 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r199063 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <200911082131.nA8LVaQD098609@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911082131.nA8LVaQD098609>