back out vfs lite2 till after 2.2

1 files changed, 4 insertions, 55 deletions

diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 3fe5a46bfa8..08480c57903 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_extern.h,v 1.3 1997/10/06 15:26:29 csapuntz Exp $	*/
+/*	$OpenBSD: ffs_extern.h,v 1.4 1997/10/06 20:21:35 deraadt Exp $	*/
 /*	$NetBSD: ffs_extern.h,v 1.4 1996/02/09 22:22:22 christos Exp $	*/
 
 /*-
@@ -36,21 +36,6 @@
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
  */
 
-#define FFS_CLUSTERREAD		1	/* cluster reading enabled */
-#define FFS_CLUSTERWRITE	2	/* cluster writing enabled */
-#define FFS_REALLOCBLKS		3	/* block reallocation enabled */
-#define FFS_ASYNCFREE		4	/* asynchronous block freeing enabled */
-#define	FFS_MAXID		5	/* number of valid ffs ids */
-
-#define FFS_NAMES { \
-	{ 0, 0 }, \
-	{ "doclusterread", CTLTYPE_INT }, \
-	{ "doclusterwrite", CTLTYPE_INT }, \
-	{ "doreallocblks", CTLTYPE_INT }, \
-	{ "doasyncfree", CTLTYPE_INT }, \
-}
-
-
 struct buf;
 struct fid;
 struct fs;
@@ -62,7 +47,6 @@ struct statfs;
 struct timeval;
 struct ucred;
 struct ufsmount;
-struct vfsconf;
 struct uio;
 struct vnode;
 struct mbuf;
@@ -83,10 +67,11 @@ int ffs_vfree __P((void *));
 void ffs_clusteracct __P((struct fs *, struct cg *, daddr_t, int));
 
 /* ffs_balloc.c */
-int ffs_balloc __P((void *));
+int ffs_balloc __P((struct inode *, daddr_t, int, struct ucred *,
+		    struct buf **, int));
 
 /* ffs_inode.c */
-int ffs_init __P((struct vfsconf *));
+void ffs_init __P((void));
 int ffs_update __P((void *));
 int ffs_truncate __P((void *));
 
@@ -96,8 +81,6 @@ void ffs_fragacct __P((struct fs *, int, int32_t[], int));
 #ifdef DIAGNOSTIC
 void	ffs_checkoverlap __P((struct buf *, struct inode *));
 #endif
-int   ffs_freefile __P((struct vop_vfree_args *));
-int   ffs_isfreeblock __P((struct fs *, unsigned char *, daddr_t));
 int ffs_isblock __P((struct fs *, unsigned char *, daddr_t));
 void ffs_clrblock __P((struct fs *, u_char *, daddr_t));
 void ffs_setblock __P((struct fs *, unsigned char *, daddr_t));
@@ -117,8 +100,6 @@ int ffs_vget __P((struct mount *, ino_t, struct vnode **));
 int ffs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
 		    struct vnode **, int *, struct ucred **));
 int ffs_vptofh __P((struct vnode *, struct fid *));
-int ffs_sysctl __P((int *, u_int, void *, size_t *, void *, size_t,
-		    struct proc *));
 int ffs_sbupdate __P((struct ufsmount *, int));
 int ffs_cgupdate __P((struct ufsmount *, int));
 
@@ -127,38 +108,6 @@ int ffs_read __P((void *));
 int ffs_write __P((void *));
 int ffs_fsync __P((void *));
 int ffs_reclaim __P((void *));
-
-
-/*
- * Soft dependency function prototypes.
- */
-
-struct vop_vfree_args;
-struct vop_fsync_args;
-
-void  softdep_initialize __P((void));
-int   softdep_process_worklist __P((struct mount *));
-int   softdep_mount __P((struct vnode *, struct mount *, struct fs *,
-          struct ucred *));
-int   softdep_flushfiles __P((struct mount *, int, struct proc *));
-void  softdep_update_inodeblock __P((struct inode *, struct buf *, int));
-void  softdep_load_inodeblock __P((struct inode *));
-int   softdep_fsync __P((struct vnode *));
-void  softdep_freefile __P((struct vop_vfree_args *));
-void  softdep_setup_freeblocks __P((struct inode *, off_t));
-void  softdep_deallocate_dependencies __P((struct buf *));
-void  softdep_setup_inomapdep __P((struct buf *, struct inode *, ino_t));
-void  softdep_setup_blkmapdep __P((struct buf *, struct fs *, daddr_t));
-void  softdep_setup_allocdirect __P((struct inode *, ufs_lbn_t, daddr_t,
-          daddr_t, long, long, struct buf *));
-void  softdep_setup_allocindir_meta __P((struct buf *, struct inode *,
-          struct buf *, int, daddr_t));
-void  softdep_setup_allocindir_page __P((struct inode *, ufs_lbn_t,
-          struct buf *, int, daddr_t, daddr_t, struct buf *));
-void  softdep_disk_io_initiation __P((struct buf *));
-void  softdep_disk_write_complete __P((struct buf *));
-int   softdep_sync_metadata __P((struct vop_fsync_args *));
-
 __END_DECLS
 
 extern int (**ffs_vnodeop_p) __P((void *));