svn commit: r285995 - head/sys/fs/ext2fs

Jeff Roberson jeff at FreeBSD.org
Wed Jul 29 03:06:10 UTC 2015


Author: jeff
Date: Wed Jul 29 03:06:08 2015
New Revision: 285995
URL: https://svnweb.freebsd.org/changeset/base/285995

Log:
   - Remove some dead code copied from ffs.

Modified:
  head/sys/fs/ext2fs/ext2_subr.c

Modified: head/sys/fs/ext2fs/ext2_subr.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_subr.c	Wed Jul 29 02:34:25 2015	(r285994)
+++ head/sys/fs/ext2fs/ext2_subr.c	Wed Jul 29 03:06:08 2015	(r285995)
@@ -54,10 +54,6 @@
 #include <fs/ext2fs/ext2_mount.h>
 #include <fs/ext2fs/ext2_dinode.h>
 
-#ifdef KDB
-void	ext2_checkoverlap(struct buf *, struct inode *);
-#endif
-
 /*
  * Return buffer with the contents of block "offset" from the beginning of
  * directory "ip".  If "res" is non-zero, fill it in with a pointer to the
@@ -130,34 +126,6 @@ normal:
 	return (0);
 }
 
-#ifdef KDB
-void
-ext2_checkoverlap(struct buf *bp, struct inode *ip)
-{
-	struct buf *ebp, *ep;
-	e4fs_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))
-			continue;
-		vp = ip->i_ump->um_devvp;
-		/* 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 %jd, end %jd overlap start %jd, end %jd\n",
-		    (intmax_t)start, (intmax_t)last, (intmax_t)ep->b_blkno,
-		    (intmax_t)(ep->b_blkno + btodb(ep->b_bcount) - 1));
-		panic("ext2_checkoverlap: Disk buffer overlap");
-	}
-}
-#endif /* KDB */
-
 /*
  * Update the cluster map because of an allocation of free like ffs.
  *


More information about the svn-src-all mailing list