svn commit: r199063 -
user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Kip Macy
kmacy at FreeBSD.org
Sun Nov 8 21:31:36 UTC 2009
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);
More information about the svn-src-user
mailing list