From ad17f7a16a3b9364bc4fe8114510203c48d87696 Mon Sep 17 00:00:00 2001
From: Jason Downs <downsj@cvs.openbsd.org>
Date: Mon, 15 Jul 1996 03:39:30 +0000
Subject: kill some more FreeBSD-isms, bring back some Lite-isms.

---
 sys/gnu/ext2fs/ext2_alloc.c  |  4 +---
 sys/gnu/ext2fs/ext2_balloc.c |  3 +--
 sys/gnu/ext2fs/ext2_inode.c  |  9 ++-------
 sys/gnu/ext2fs/ext2_lookup.c | 10 +---------
 4 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'sys/gnu')

diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index a6c3e79598d..c4fee2162d1 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2_alloc.c,v 1.2 1996/07/14 06:46:06 downsj Exp $	*/
+/*	$OpenBSD: ext2_alloc.c,v 1.3 1996/07/15 03:39:27 downsj Exp $	*/
 
 /*
  *  modified for Lites 1.1
@@ -171,8 +171,6 @@ ext2_alloc(ip, lbn, bpref, size, cred, bnp)
 #endif
 
 	if (bno > 0) {
-		(void) vnode_pager_uncache(ITOV(ip));
-
 		/* set next_alloc fields as done in block_getblk */
 		ip->i_next_alloc_block = lbn;
 		ip->i_next_alloc_goal = bno;
diff --git a/sys/gnu/ext2fs/ext2_balloc.c b/sys/gnu/ext2fs/ext2_balloc.c
index 502804d794a..50654bfe210 100644
--- a/sys/gnu/ext2fs/ext2_balloc.c
+++ b/sys/gnu/ext2fs/ext2_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2_balloc.c,v 1.2 1996/07/14 06:46:06 downsj Exp $	*/
+/*	$OpenBSD: ext2_balloc.c,v 1.3 1996/07/15 03:39:28 downsj Exp $	*/
 
 /*
  *  modified for Lites 1.1
@@ -155,7 +155,6 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
 			if (flags & B_CLRBUF)
 				clrbuf(bp);
 		}
-		vnode_pager_setsize(vp, (u_long)ip->i_size);	/* XXX */
 		ip->i_db[bn] = dbtofsb(fs, bp->b_blkno);
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
 		*bpp = bp;
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index e9c5b6199b2..3325170c123 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2_inode.c,v 1.2 1996/07/14 06:46:07 downsj Exp $	*/
+/*	$OpenBSD: ext2_inode.c,v 1.3 1996/07/15 03:39:28 downsj Exp $	*/
 
 /*
  *  modified for Lites 1.1
@@ -131,16 +131,12 @@ ext2_update(v)
 	}
 	ext2_di2ei( &ip->i_din, (struct ext2_inode *) ((char *)bp->b_data + EXT2_INODE_SIZE *
 	    ino_to_fsbo(fs, ip->i_number)));
-/*
-	if (ap->a_waitfor && (ap->a_vp->v_mount->mnt_flag & MNT_ASYNC) == 0)
+	if (ap->a_waitfor)
 		return (bwrite(bp));
 	else {
-*/
 		bdwrite(bp);
 		return (0);
-/*
 	}
-*/
 }
 
 #define	SINGLE	0	/* index of single indirect block */
@@ -220,7 +216,6 @@ printf("ext2_truncate called %d to %d\n", VTOI(ovp)->i_number, ap->a_length);
 		aflags = B_CLRBUF;
 		if (ap->a_flags & IO_SYNC)
 			aflags |= B_SYNC;
-		vnode_pager_setsize(ovp, length);
 		if (error = ext2_balloc(oip, lbn, offset + 1, ap->a_cred, &bp,
 		    aflags))
 			return (error);
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index ce8d3e7e059..de5bc782eb2 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2_lookup.c,v 1.1 1996/06/24 03:34:57 downsj Exp $	*/
+/*	$OpenBSD: ext2_lookup.c,v 1.2 1996/07/15 03:39:29 downsj Exp $	*/
 
 /*
  *  modified for Lites 1.1
@@ -102,7 +102,6 @@ ext2_dirconv2ffs( e2dir, ffsdir)
 	de.d_fileno = e2dir->inode;
 	de.d_namlen = e2dir->name_len;
 
-#ifndef NO_HARDWIRED_CONSTANTS
 	if(e2dir->name_len + 8 == e2dir->rec_len)
 		de.d_reclen += 4;
 
@@ -115,13 +114,6 @@ ext2_dirconv2ffs( e2dir, ffsdir)
 	 */
 	de.d_reclen = (de.d_namlen+8+1+3) & ~3;
 	bcopy(&de, ffsdir, de.d_reclen);
-#endif
-
-#if 0
-	printf("dirconv: ino %d rec old %d rec new %d nam %d name %s\n",
-		ffsdir->d_fileno, e2dir->rec_len, ffsdir->d_reclen, 
-		ffsdir->d_namlen, ffsdir->d_name);
-#endif
 }
 
 /*
-- 
cgit v1.2.3