From 75236818950431f8b70542e6286774a2f678e3ee Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 16 Jun 2000 13:00:33 +0000
Subject: [PATCH] ARGH!  I have too many source trees :-(

Fix prototype errors in last commit.
---
 sys/contrib/softupdates/ffs_softdep.c | 6 ++----
 sys/sys/mount.h                       | 2 +-
 sys/ufs/ffs/ffs_extern.h              | 1 +
 sys/ufs/ffs/ffs_softdep.c             | 6 ++----
 sys/ufs/ffs/ffs_softdep_stub.c        | 1 +
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sys/contrib/softupdates/ffs_softdep.c b/sys/contrib/softupdates/ffs_softdep.c
index 657436317fc6..870d6acdf714 100644
--- a/sys/contrib/softupdates/ffs_softdep.c
+++ b/sys/contrib/softupdates/ffs_softdep.c
@@ -213,8 +213,6 @@ static	void add_to_worklist __P((struct worklist *));
 static	void softdep_disk_io_initiation __P((struct buf *));
 static	void softdep_disk_write_complete __P((struct buf *));
 static	void softdep_deallocate_dependencies __P((struct buf *));
-static	int softdep_fsync __P((struct vnode *));
-static	int softdep_process_worklist __P((struct mount *));
 static	void softdep_move_dependencies __P((struct buf *, struct buf *));
 static	int softdep_count_dependencies __P((struct buf *bp, int));
 
@@ -521,7 +519,7 @@ add_to_worklist(wk)
  * ordering ensures that no new <vfsid, inum, lbn> triples will be generated
  * until all the old ones have been purged from the dependency lists.
  */
-static int 
+int 
 softdep_process_worklist(matchmnt)
 	struct mount *matchmnt;
 {
@@ -3690,7 +3688,7 @@ merge_inode_lists(inodedep)
  * If we are doing an fsync, then we must ensure that any directory
  * entries for the inode have been written after the inode gets to disk.
  */
-static int
+int
 softdep_fsync(vp)
 	struct vnode *vp;	/* the "in_core" copy of the inode */
 {
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index c3edefddd78e..5e3484eeee7a 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -447,7 +447,7 @@ int	vfs_stduninit __P((struct vfsconf *));
 int	vfs_stdextattrctl __P((struct mount *mp, int cmd, const char *attrname,
 		caddr_t arg, struct proc *p));
 
-void	softdep_process_worklist __P((struct mount *));
+int	softdep_process_worklist __P((struct mount *));
 #else /* !_KERNEL */
 
 #include <sys/cdefs.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 02848a3a74d5..778376eb416f 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -125,5 +125,6 @@ void	softdep_setup_allocindir_page __P((struct inode *, ufs_lbn_t,
 	    struct buf *, int, ufs_daddr_t, ufs_daddr_t, struct buf *));
 void	softdep_fsync_mountdev __P((struct vnode *));
 int	softdep_sync_metadata __P((struct vop_fsync_args *));
+int	softdep_fsync __P((struct vnode *vp));
 
 #endif /* !_UFS_FFS_EXTERN_H */
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 657436317fc6..870d6acdf714 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -213,8 +213,6 @@ static	void add_to_worklist __P((struct worklist *));
 static	void softdep_disk_io_initiation __P((struct buf *));
 static	void softdep_disk_write_complete __P((struct buf *));
 static	void softdep_deallocate_dependencies __P((struct buf *));
-static	int softdep_fsync __P((struct vnode *));
-static	int softdep_process_worklist __P((struct mount *));
 static	void softdep_move_dependencies __P((struct buf *, struct buf *));
 static	int softdep_count_dependencies __P((struct buf *bp, int));
 
@@ -521,7 +519,7 @@ add_to_worklist(wk)
  * ordering ensures that no new <vfsid, inum, lbn> triples will be generated
  * until all the old ones have been purged from the dependency lists.
  */
-static int 
+int 
 softdep_process_worklist(matchmnt)
 	struct mount *matchmnt;
 {
@@ -3690,7 +3688,7 @@ merge_inode_lists(inodedep)
  * If we are doing an fsync, then we must ensure that any directory
  * entries for the inode have been written after the inode gets to disk.
  */
-static int
+int
 softdep_fsync(vp)
 	struct vnode *vp;	/* the "in_core" copy of the inode */
 {
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index 8845fbd6a164..806ba24ea069 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -48,6 +48,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
+#include <sys/mount.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ffs/ffs_extern.h>