3 files changed, 13 insertions, 7 deletions

diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index eeff9f646118..8d4673338f40 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -211,11 +211,15 @@ nospace:
  * Note that the error return is not reflected back to the user. Rather
  * the previous block allocation will be used.
  */
+
+#ifdef FANCY_REALLOC
 #include <sys/sysctl.h>
 static int doasyncfree = 1;
 #ifdef	OPT_DEBUG
 SYSCTL_INT(_debug, 14, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, "");
 #endif	/* OPT_DEBUG */
+#endif
+
 int
 ext2_reallocblks(ap)
 	struct vop_reallocblks_args /* {
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index 022f6d734003..caa16efcc8a2 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -974,7 +974,6 @@ ext2_dirempty(ip, parentino, cred)
 	struct dirtemplate dbuf;
 	register struct ext2_dir_entry *dp = (struct ext2_dir_entry *)&dbuf;
 	int error, count, namlen;
-	int     DIRBLKSIZ = ip->i_e2fs->s_blocksize;
 		 
 #define	MINDIRSIZ (sizeof (struct dirtemplate) / 2)
 
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index b2abbd53f686..d7c3e038885a 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -80,7 +80,6 @@ static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
 static int ext2_mount __P((struct mount *,
 	    char *, caddr_t, struct nameidata *, struct proc *));
 static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-static int ext2_mountroot __P((void));
 static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
 			struct proc *p));
 static int ext2_sbupdate __P((struct ufsmount *, int));
@@ -115,17 +114,20 @@ extern u_long nextgennumber;
 static int ext2fs_inode_hash_lock;
 #endif
 
+static int	compute_sb_data __P((struct vnode * devvp,
+				     struct ext2_super_block * es,
+				     struct ext2_sb_info * fs));
+
+#ifdef notyet
+static int ext2_mountroot __P((void));
+
 /*
- * Called by main() when ufs is going to be mounted as root.
+ * Called by main() when ext2fs is going to be mounted as root.
  *
  * Name is updated by mount(8) after booting.
  */
 #define ROOTNAME	"root_device"
 
-static int	compute_sb_data __P((struct vnode * devvp,
-				     struct ext2_super_block * es,
-				     struct ext2_sb_info * fs));
-
 static int
 ext2_mountroot()
 {
@@ -183,6 +185,7 @@ ext2_mountroot()
 	inittodr(fs->s_es->s_wtime);		/* this helps to set the time */
 	return (0);
 }
+#endif
 
 /*
  * VFS Operations.