Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_balloc.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_balloc.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.40
retrieving revision 1.40.6.1
diff -u -p -r1.40 -r1.40.6.1
--- src/sys/ufs/ffs/ffs_balloc.c	2005/12/11 12:25:25	1.40
+++ src/sys/ufs/ffs/ffs_balloc.c	2006/04/22 11:40:23	1.40.6.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_balloc.c,v 1.40 2005/12/11 12:25:25 christos Exp $	*/
+/*	$NetBSD: ffs_balloc.c,v 1.40.6.1 2006/04/22 11:40:23 simonb Exp $	*/
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.40 2005/12/11 12:25:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.40.6.1 2006/04/22 11:40:23 simonb Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -147,7 +147,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t 
 			uvm_vnp_setsize(vp, ip->i_ffs1_size);
 			ip->i_ffs1_db[nb] = ufs_rw32((u_int32_t)newb, needswap);
 			ip->i_flag |= IN_CHANGE | IN_UPDATE;
-			if (bpp) {
+			if (bpp && *bpp) {
 				if (flags & B_SYNC)
 					bwrite(*bpp);
 				else
@@ -371,6 +371,7 @@ ffs_balloc_ufs1(struct vnode *vp, off_t 
 	}
 
 	if (flags & B_METAONLY) {
+		KASSERT(bpp != NULL);
 		*bpp = bp;
 		return (0);
 	}
@@ -914,6 +915,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t 
 	}
 
 	if (flags & B_METAONLY) {
+		KASSERT(bpp != NULL);
 		*bpp = bp;
 		return (0);
 	}