From 57a4e3fa8a6dd1fc09a822903a424110e642e5ec Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 3 Dec 1995 11:17:15 +0000 Subject: [PATCH] Completed function declarations and/or added prototypes and/or #includes to get the prototypes. --- sys/ufs/ffs/ffs_alloc.c | 23 ++++++++++++----------- sys/ufs/lfs/lfs_bio.c | 4 +++- sys/ufs/lfs/lfs_cksum.c | 9 +++++++-- sys/ufs/lfs/lfs_segment.c | 6 ++++-- sys/ufs/mfs/mfs_vfsops.c | 4 +++- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index a308f60b8e1..08c31139baf 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $Id: ffs_alloc.c,v 1.18 1995/11/14 09:40:04 phk Exp $ + * $Id: ffs_alloc.c,v 1.19 1995/11/19 19:55:26 dyson Exp $ */ #include @@ -47,13 +47,16 @@ #include #include -#include /* YF - needed for ufs_getlbns() */ +#include #include #include extern u_long nextgennumber; +typedef long allocfcn_t __P((struct inode *ip, int cg, daddr_t bpref, + int size)); + static daddr_t ffs_alloccg __P((struct inode *, int, daddr_t, int)); static daddr_t ffs_alloccgblk __P((struct fs *, struct cg *, daddr_t)); static daddr_t ffs_clusteralloc __P((struct inode *, int, daddr_t, int)); @@ -61,7 +64,7 @@ static ino_t ffs_dirpref __P((struct fs *)); static daddr_t ffs_fragextend __P((struct inode *, int, long, int, int)); static void ffs_fserr __P((struct fs *, u_int, char *)); static u_long ffs_hashalloc - __P((struct inode *, int, long, int, u_long (*)())); + __P((struct inode *, int, long, int, allocfcn_t *)); static ino_t ffs_nodealloccg __P((struct inode *, int, daddr_t, int)); static daddr_t ffs_mapsearch __P((struct fs *, struct cg *, daddr_t, int)); @@ -128,8 +131,7 @@ ffs_alloc(ip, lbn, bpref, size, cred, bnp) cg = ino_to_cg(fs, ip->i_number); else cg = dtog(fs, bpref); - bno = (daddr_t)ffs_hashalloc(ip, cg, (long)bpref, size, - (u_long (*)())ffs_alloccg); + bno = (daddr_t)ffs_hashalloc(ip, cg, (long)bpref, size, ffs_alloccg); if (bno > 0) { ip->i_blocks += btodb(size); ip->i_flag |= IN_CHANGE | IN_UPDATE; @@ -278,8 +280,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp) panic("ffs_realloccg: bad optim"); /* NOTREACHED */ } - bno = (daddr_t)ffs_hashalloc(ip, cg, (long)bpref, request, - (u_long (*)())ffs_alloccg); + bno = (daddr_t)ffs_hashalloc(ip, cg, (long)bpref, request, ffs_alloccg); if (bno > 0) { bp->b_blkno = fsbtodb(fs, bno); ffs_blkfree(ip, bprev, (long)osize); @@ -413,7 +414,7 @@ ffs_reallocblks(ap) * Search the block map looking for an allocation of the desired size. */ if ((newblk = (daddr_t)ffs_hashalloc(ip, dtog(fs, pref), (long)pref, - len, (u_long (*)())ffs_clusteralloc)) == 0) + len, ffs_clusteralloc)) == 0) goto fail; /* * We have found a new contiguous block. @@ -689,10 +690,10 @@ ffs_hashalloc(ip, cg, pref, size, allocator) int cg; long pref; int size; /* size for data blocks, mode for inodes */ - u_long (*allocator)(); + allocfcn_t *allocator; { register struct fs *fs; - long result; + long result; /* XXX why not same type as we return? */ int i, icg = cg; fs = ip->i_fs; @@ -727,7 +728,7 @@ ffs_hashalloc(ip, cg, pref, size, allocator) if (cg == fs->fs_ncg) cg = 0; } - return (NULL); + return (0); } /* diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c index b1388d1fd30..045e743b30a 100644 --- a/sys/ufs/lfs/lfs_bio.c +++ b/sys/ufs/lfs/lfs_bio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_bio.c 8.4 (Berkeley) 12/30/93 - * $Id: lfs_bio.c,v 1.5 1994/10/10 01:04:49 phk Exp $ + * $Id: lfs_bio.c,v 1.6 1995/08/11 11:31:16 davidg Exp $ */ #include @@ -50,6 +50,8 @@ #include #include +extern void lfs_flush __P((void)); + /* * LFS block write function. * diff --git a/sys/ufs/lfs/lfs_cksum.c b/sys/ufs/lfs/lfs_cksum.c index b3f689c95db..7fdb8d1d1ea 100644 --- a/sys/ufs/lfs/lfs_cksum.c +++ b/sys/ufs/lfs/lfs_cksum.c @@ -31,10 +31,15 @@ * SUCH DAMAGE. * * @(#)lfs_cksum.c 8.1 (Berkeley) 6/11/93 - * $Id: lfs_cksum.c,v 1.2 1994/08/02 07:54:32 davidg Exp $ + * $Id: lfs_cksum.c,v 1.3 1995/05/30 08:15:14 rgrimes Exp $ */ -#include +#include +#include +#include + +#include +#include /* * Simple, general purpose, fast checksum. Data must be short-aligned. diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c index aa7b1c5f5f1..1fc1dec6744 100644 --- a/sys/ufs/lfs/lfs_segment.c +++ b/sys/ufs/lfs/lfs_segment.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_segment.c 8.5 (Berkeley) 1/4/94 - * $Id: lfs_segment.c,v 1.13 1995/08/16 16:14:13 bde Exp $ + * $Id: lfs_segment.c,v 1.14 1995/09/04 00:21:01 dyson Exp $ */ #include @@ -60,7 +60,9 @@ #include #include -extern int count_lock_queue __P((void)); +extern int count_lock_queue __P((void)); +extern caddr_t lfs_alloc_buffer __P((int size)); +extern void lfs_reclaim_buffers __P((void)); #define MAX_ACTIVE 10 #define MAX_IO_BUFS 256 diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 2b7ea253494..28e8ffe2c73 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.4 (Berkeley) 4/16/94 - * $Id: mfs_vfsops.c,v 1.15 1995/11/28 02:15:29 peter Exp $ + * $Id: mfs_vfsops.c,v 1.16 1995/11/28 03:15:58 peter Exp $ */ #include @@ -62,6 +62,8 @@ #include #include +extern int mfs_initminiroot __P((caddr_t base)); + caddr_t mfs_rootbase; /* address of mini-root in kernel virtual memory */ u_long mfs_rootsize; /* size of mini-root in bytes */