From NetBSD: update to 960217 sources

1 files changed, 99 insertions, 54 deletions

diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index 42d4eb34254..826e7f14356 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -1,4 +1,5 @@
-/*	$NetBSD: lfs_extern.h,v 1.3 1994/12/14 13:03:47 mycroft Exp $	*/
+/*	$OpenBSD: lfs_extern.h,v 1.2 1996/02/27 07:13:24 niklas Exp $	*/
+/*	$NetBSD: lfs_extern.h,v 1.5 1996/02/12 15:20:12 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -44,65 +45,109 @@ struct timeval;
 struct inode;
 struct uio;
 struct mbuf;
+struct dinode;
+struct buf;
+struct vnode;
+struct lfs;
+struct segment;
+struct ucred;
 
 __BEGIN_DECLS
-u_long	 cksum __P((void *, size_t));				/* XXX */
-int	 lfs_balloc __P((struct vnode *, u_long, daddr_t, struct buf **));
-int	 lfs_blkatoff __P((struct vop_blkatoff_args *));
-int	 lfs_bwrite __P((struct vop_bwrite_args *));
-int	 lfs_check __P((struct vnode *, daddr_t));
-int	 lfs_close __P((struct vop_close_args *));
-int	 lfs_create __P((struct vop_create_args *));
-int	 lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
-	    struct vnode **, int *, struct ucred **));
-int	 lfs_fsync __P((struct vop_fsync_args *));
-int	 lfs_getattr __P((struct vop_getattr_args *));
-struct dinode *
-	 lfs_ifind __P((struct lfs *, ino_t, struct dinode *));
-int	 lfs_inactive __P((struct vop_inactive_args *));
-int	 lfs_init __P((void));
-int	 lfs_initseg __P((struct lfs *));
-int	 lfs_link __P((struct vop_link_args *));
-int	 lfs_makeinode __P((int, struct nameidata *, struct inode **));
-int	 lfs_mkdir __P((struct vop_mkdir_args *));
-int	 lfs_mknod __P((struct vop_mknod_args *));
-int	 lfs_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct proc *));
-int	 lfs_mountroot __P((void));
-struct buf *
-	 lfs_newbuf __P((struct vnode *, daddr_t, size_t));
-int	 lfs_read __P((struct vop_read_args *));
-int	 lfs_reclaim __P((struct vop_reclaim_args *));
-int	 lfs_remove __P((struct vop_remove_args *));
-int	 lfs_rmdir __P((struct vop_rmdir_args *));
-int	 lfs_rename __P((struct vop_rename_args *));
-void	 lfs_seglock __P((struct lfs *, unsigned long flags));
-void	 lfs_segunlock __P((struct lfs *));
-int	 lfs_segwrite __P((struct mount *, int));
-int	 lfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int	 lfs_symlink __P((struct vop_symlink_args *));
-int	 lfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int	 lfs_truncate __P((struct vop_truncate_args *));
-int	 lfs_unmount __P((struct mount *, int, struct proc *));
-int	 lfs_update __P((struct vop_update_args *));
-int	 lfs_valloc __P((struct vop_valloc_args *));
-int	 lfs_vcreate __P((struct mount *, ino_t, struct vnode **));
-int	 lfs_vfree __P((struct vop_vfree_args *));
-int	 lfs_vflush __P((struct vnode *));
-int	 lfs_vget __P((struct mount *, ino_t, struct vnode **));
-int	 lfs_vptofh __P((struct vnode *, struct fid *));
-int	 lfs_vref __P((struct vnode *));
-void	 lfs_vunref __P((struct vnode *));
-int	 lfs_write __P((struct vop_write_args *));
+/* lfs_alloc.c */
+int lfs_vcreate __P((struct mount *, ino_t, struct vnode **));
+
+
+/* lfs_balloc.c */
+int lfs_balloc __P((struct vnode *, u_long, daddr_t, struct buf **));
+
+/* lfs_bio.c */
+void lfs_flush __P((void));
+int lfs_check __P((struct vnode *, daddr_t));
+
+/* lfs_cksum.c */
+u_long cksum __P((void *, size_t));
+
+/* lfs_debug.c */
 #ifdef DEBUG
-void	lfs_dump_dinode __P((struct dinode *));
-void	lfs_dump_super __P((struct lfs *));
+void lfs_dump_super __P((struct lfs *));
+void lfs_dump_dinode __P((struct dinode *));
 #endif
+
+/* lfs_inode.c */
+void lfs_init __P((void));
+struct dinode *lfs_ifind __P((struct lfs *, ino_t, struct dinode *));
+
+/* lfs_segment.c */
+int lfs_vflush __P((struct vnode *));
+void lfs_writevnodes __P((struct lfs *, struct mount *, struct segment *, int));
+int lfs_segwrite __P((struct mount *, int));
+void lfs_writefile __P((struct lfs *, struct segment *, struct vnode *));
+int lfs_writeinode __P((struct lfs *, struct segment *, struct inode *));
+int lfs_gatherblock __P((struct segment *, struct buf *, int *));
+void lfs_gather __P((struct lfs *, struct segment *, struct vnode *, int (*match )__P ((struct lfs *, struct buf *))));
+void lfs_updatemeta __P((struct segment *));
+int lfs_initseg __P((struct lfs *));
+void lfs_newseg __P((struct lfs *));
+int lfs_writeseg __P((struct lfs *, struct segment *));
+void lfs_writesuper __P((struct lfs *));
+int lfs_match_data __P((struct lfs *, struct buf *));
+int lfs_match_indir __P((struct lfs *, struct buf *));
+int lfs_match_dindir __P((struct lfs *, struct buf *));
+int lfs_match_tindir __P((struct lfs *, struct buf *));
+struct buf *lfs_newbuf __P((struct vnode *, daddr_t, size_t));
+void lfs_callback __P((struct buf *));
+void lfs_supercallback __P((struct buf *));
+void lfs_shellsort __P((struct buf **, daddr_t *, int));
+int lfs_vref __P((struct vnode *));
+void lfs_vunref __P((struct vnode *));
+
+/* lfs_subr.c */
+void lfs_seglock __P((struct lfs *, unsigned long));
+void lfs_segunlock __P((struct lfs *));
+
+/* lfs_syscalls.c */
+int lfs_fastvget __P((struct mount *, ino_t, daddr_t, struct vnode **, struct dinode *));
+struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t));
+
+/* lfs_vfsops.c */
+int lfs_mountroot __P((void));
+int lfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *));
+int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
+int lfs_unmount __P((struct mount *, int, struct proc *));
+int lfs_statfs __P((struct mount *, struct statfs *, struct proc *));
+int lfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
+int lfs_vget __P((struct mount *, ino_t, struct vnode **));
+int lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *, struct vnode **, int *, struct ucred **));
+int lfs_vptofh __P((struct vnode *, struct fid *));
+
+
+int lfs_valloc		__P((void *));
+int lfs_vfree		__P((void *));
+int lfs_bwrite		__P((void *));
+int lfs_update		__P((void *));
+int lfs_truncate	__P((void *));
+int lfs_blkatoff	__P((void *));
+int lfs_fsync		__P((void *));
+int lfs_symlink		__P((void *));
+int lfs_mknod		__P((void *));
+int lfs_create		__P((void *));
+int lfs_mkdir		__P((void *));
+int lfs_read		__P((void *));
+int lfs_remove		__P((void *));
+int lfs_rmdir		__P((void *));
+int lfs_link		__P((void *));
+int lfs_rename		__P((void *));
+int lfs_getattr		__P((void *));
+int lfs_close		__P((void *));
+int lfs_inactive	__P((void *));
+int lfs_reclaim		__P((void *));
+int lfs_write		__P((void *));
+
 __END_DECLS
-extern int (**lfs_vnodeop_p)();
-extern int (**lfs_specop_p)();
+extern int (**lfs_vnodeop_p) __P((void *));
+extern int (**lfs_specop_p) __P((void *));
 #ifdef FIFO
-extern int (**lfs_fifoop_p)();
+extern int (**lfs_fifoop_p) __P((void *));
 #define LFS_FIFOOPS lfs_fifoop_p
 #else
 #define LFS_FIFOOPS NULL