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_subr.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_subr.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- src/sys/ufs/ffs/ffs_subr.c	2005/12/11 12:25:25	1.39
+++ src/sys/ufs/ffs/ffs_subr.c	2005/12/27 04:06:46	1.40
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_subr.c,v 1.39 2005/12/11 12:25:25 christos Exp $	*/
+/*	$NetBSD: ffs_subr.c,v 1.40 2005/12/27 04:06:46 chs Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.39 2005/12/11 12:25:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.40 2005/12/27 04:06:46 chs Exp $");
 
 #include <sys/param.h>
 
@@ -178,43 +178,6 @@ ffs_fragacct(struct fs *fs, int fragmap,
 	}
 }
 
-#if defined(_KERNEL) && defined(DIAGNOSTIC)
-void
-ffs_checkoverlap(struct buf *bp, struct inode *ip)
-{
-#if 0
-	struct buf *ebp, *ep;
-	daddr_t start, last;
-	struct vnode *vp;
-
-	ebp = &buf[nbuf];
-	start = bp->b_blkno;
-	last = start + btodb(bp->b_bcount) - 1;
-	for (ep = buf; ep < ebp; ep++) {
-		if (ep == bp || (ep->b_flags & B_INVAL) ||
-		    ep->b_vp == NULLVP)
-			continue;
-		if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL))
-			continue;
-		if (vp != ip->i_devvp)
-			continue;
-		/* look for overlap */
-		if (ep->b_bcount == 0 || ep->b_blkno > last ||
-		    ep->b_blkno + btodb(ep->b_bcount) <= start)
-			continue;
-		vprint("Disk overlap", vp);
-		printf("\tstart %" PRId64 ", end %" PRId64 " overlap start "
-		    "%" PRId64 ", end %" PRId64 "\n",
-		    start, last, ep->b_blkno,
-		    ep->b_blkno + btodb(ep->b_bcount) - 1);
-		panic("Disk buffer overlap");
-	}
-#else
-	printf("ffs_checkoverlap disabled due to buffer cache implementation changes\n");
-#endif
-}
-#endif /* _KERNEL && DIAGNOSTIC */
-
 /*
  * block operations
  *