diff options
| -rw-r--r-- | sys/kern/kern_conf.c | 9 | ||||
| -rw-r--r-- | sys/kern/kern_synch.c | 14 | ||||
| -rw-r--r-- | sys/kern/vfs_export.c | 20 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 20 | ||||
| -rw-r--r-- | sys/sys/conf.h | 4 | ||||
| -rw-r--r-- | sys/sys/linedisc.h | 4 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 5 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 9 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_extern.h | 7 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_subr.c | 8 |
10 files changed, 50 insertions, 50 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index fba334b..e66ebe1 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_conf.c,v 1.21 1997/09/21 22:20:12 julian Exp $ + * $Id: kern_conf.c,v 1.22 1997/09/27 13:39:03 kato Exp $ */ #include <sys/param.h> @@ -48,7 +48,8 @@ int nblkdev = NUMBDEV; struct cdevsw *cdevsw[NUMCDEV]; int nchrdev = NUMCDEV; - +static void cdevsw_make __P((struct bdevsw *from)); +static int isdisk __P((dev_t dev, int type)); /* * Routine to determine if a device is a disk. @@ -56,7 +57,7 @@ int nchrdev = NUMCDEV; * KLUDGE XXX add flags to cdevsw entries for disks XXX * A minimal stub routine can always return 0. */ -int +static int isdisk(dev, type) dev_t dev; int type; @@ -168,7 +169,7 @@ ADDENTRY(cdevsw, nchrdev,cdevsw_ALLOCSTART) * than specifying it by hand. */ -void +static void cdevsw_make(struct bdevsw *from) { struct cdevsw *to = from->d_cdev; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 88e759f..1d41773 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $Id: kern_synch.c,v 1.39 1997/09/21 22:00:14 gibbs Exp $ + * $Id: kern_synch.c,v 1.40 1997/11/21 11:36:56 bde Exp $ */ #include "opt_ktrace.h" @@ -64,8 +64,8 @@ SYSINIT(runqueue, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, rqinit, NULL) u_char curpriority; /* usrpri of curproc */ int lbolt; /* once a second sleep address */ -extern void endtsleep __P((void *)); -extern void updatepri __P((struct proc *p)); +static void endtsleep __P((void *)); +static void updatepri __P((struct proc *p)); #define MAXIMUM_SCHEDULE_QUANTUM (1000000) /* arbitrary limit */ #ifndef DEFAULT_SCHEDULE_QUANTUM @@ -176,7 +176,7 @@ roundrobin(arg) #define decay_cpu(loadfac, cpu) (((loadfac) * (cpu)) / ((loadfac) + FSCALE)) /* decay 95% of `p_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */ -fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ +static fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ /* * If `ccpu' is not equal to `exp(-1/20)' and you still want to use the @@ -265,7 +265,7 @@ schedcpu(arg) * For all load averages >= 1 and max p_estcpu of 255, sleeping for at * least six times the loadfactor will decay p_estcpu to zero. */ -void +static void updatepri(p) register struct proc *p; { @@ -289,7 +289,7 @@ updatepri(p) * of 2. Shift right by 8, i.e. drop the bottom 256 worth. */ #define TABLESIZE 128 -TAILQ_HEAD(slpquehead, proc) slpque[TABLESIZE]; +static TAILQ_HEAD(slpquehead, proc) slpque[TABLESIZE]; #define LOOKUP(x) (((long)(x) >> 8) & (TABLESIZE - 1)) /* @@ -428,7 +428,7 @@ resume: * set timeout flag and undo the sleep. If proc * is stopped, just unsleep so it will remain stopped. */ -void +static void endtsleep(arg) void *arg; { diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 5b5d3ca..254e9a7 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.112 1997/11/07 08:53:11 phk Exp $ + * $Id: vfs_subr.c,v 1.113 1997/11/12 05:42:15 julian Exp $ */ /* @@ -70,12 +70,15 @@ static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); +static void insmntque __P((struct vnode *vp, struct mount *mp)); #ifdef DDB -extern void printlockedvnodes __P((void)); +static void printlockedvnodes __P((void)); #endif +static void vbusy __P((struct vnode *)); static void vclean __P((struct vnode *vp, int flags, struct proc *p)); +static void vfree __P((struct vnode *)); static void vgonel __P((struct vnode *vp, struct proc *p)); -unsigned long numvnodes; +static unsigned long numvnodes; SYSCTL_INT(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, ""); static void vputrele __P((struct vnode *vp, int put)); @@ -440,7 +443,7 @@ getnewvnode(tag, mp, vops, vpp) /* * Move a vnode from one mount queue to another. */ -void +static void insmntque(vp, mp) register struct vnode *vp; register struct mount *mp; @@ -1517,7 +1520,7 @@ vprint(label, vp) * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -void +static void printlockedvnodes() { struct proc *p = curproc; /* XXX */ @@ -1622,8 +1625,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS #endif /* !NO_COMPAT_PRELITE2 */ -int kinfo_vdebug = 1; -int kinfo_vgetfailed; +static volatile int kinfo_vdebug = 1; #if 0 #define KINFO_VNODESLOP 10 @@ -2083,7 +2085,7 @@ retn: return error; } -void +static void vfree(vp) struct vnode *vp; { @@ -2099,7 +2101,7 @@ vfree(vp) vp->v_flag |= VFREE; } -void +static void vbusy(vp) struct vnode *vp; { diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 5b5d3ca..254e9a7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.112 1997/11/07 08:53:11 phk Exp $ + * $Id: vfs_subr.c,v 1.113 1997/11/12 05:42:15 julian Exp $ */ /* @@ -70,12 +70,15 @@ static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); +static void insmntque __P((struct vnode *vp, struct mount *mp)); #ifdef DDB -extern void printlockedvnodes __P((void)); +static void printlockedvnodes __P((void)); #endif +static void vbusy __P((struct vnode *)); static void vclean __P((struct vnode *vp, int flags, struct proc *p)); +static void vfree __P((struct vnode *)); static void vgonel __P((struct vnode *vp, struct proc *p)); -unsigned long numvnodes; +static unsigned long numvnodes; SYSCTL_INT(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, ""); static void vputrele __P((struct vnode *vp, int put)); @@ -440,7 +443,7 @@ getnewvnode(tag, mp, vops, vpp) /* * Move a vnode from one mount queue to another. */ -void +static void insmntque(vp, mp) register struct vnode *vp; register struct mount *mp; @@ -1517,7 +1520,7 @@ vprint(label, vp) * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -void +static void printlockedvnodes() { struct proc *p = curproc; /* XXX */ @@ -1622,8 +1625,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS #endif /* !NO_COMPAT_PRELITE2 */ -int kinfo_vdebug = 1; -int kinfo_vgetfailed; +static volatile int kinfo_vdebug = 1; #if 0 #define KINFO_VNODESLOP 10 @@ -2083,7 +2085,7 @@ retn: return error; } -void +static void vfree(vp) struct vnode *vp; { @@ -2099,7 +2101,7 @@ vfree(vp) vp->v_flag |= VFREE; } -void +static void vbusy(vp) struct vnode *vp; { diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 194bfd9..c39f0ca 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $Id: conf.h,v 1.35 1997/09/14 02:25:40 peter Exp $ + * $Id: conf.h,v 1.36 1997/09/27 13:39:46 kato Exp $ */ #ifndef _SYS_CONF_H_ @@ -228,10 +228,8 @@ l_write_t l_nowrite; int bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw **old)); int cdevsw_add __P((dev_t *descrip,struct cdevsw *new,struct cdevsw **old)); -void cdevsw_make __P((struct bdevsw *from)); void bdevsw_add_generic __P((int bdev, int cdev, struct bdevsw *bdevsw)); dev_t chrtoblk __P((dev_t dev)); -int isdisk __P((dev_t dev, int type)); int iskmemdev __P((dev_t dev)); int iszerodev __P((dev_t dev)); void setconf __P((void)); diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index 194bfd9..c39f0ca 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $Id: conf.h,v 1.35 1997/09/14 02:25:40 peter Exp $ + * $Id: conf.h,v 1.36 1997/09/27 13:39:46 kato Exp $ */ #ifndef _SYS_CONF_H_ @@ -228,10 +228,8 @@ l_write_t l_nowrite; int bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw **old)); int cdevsw_add __P((dev_t *descrip,struct cdevsw *new,struct cdevsw **old)); -void cdevsw_make __P((struct bdevsw *from)); void bdevsw_add_generic __P((int bdev, int cdev, struct bdevsw *bdevsw)); dev_t chrtoblk __P((dev_t dev)); -int isdisk __P((dev_t dev, int type)); int iskmemdev __P((dev_t dev)); int iszerodev __P((dev_t dev)); void setconf __P((void)); diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 49c078c..254068f 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $Id: vnode.h,v 1.55 1997/10/26 20:54:57 phk Exp $ + * $Id: vnode.h,v 1.56 1997/11/18 09:26:50 bde Exp $ */ #ifndef _SYS_VNODE_H_ @@ -453,14 +453,11 @@ void cache_purgevfs __P((struct mount *mp)); void cvtstat __P((struct stat *st, struct ostat *ost)); int getnewvnode __P((enum vtagtype tag, struct mount *mp, vop_t **vops, struct vnode **vpp)); -void insmntque __P((struct vnode *vp, struct mount *mp)); int lease_check __P((struct vop_lease_args *ap)); void vattr_null __P((struct vattr *vap)); -void vbusy __P((struct vnode *)); int vcount __P((struct vnode *vp)); void vdrop __P((struct vnode *)); int vfinddev __P((dev_t dev, enum vtype type, struct vnode **vpp)); -void vfree __P((struct vnode *)); void vfs_opv_init __P((struct vnodeopv_desc **them)); int vflush __P((struct mount *mp, struct vnode *skipvp, int flags)); int vget __P((struct vnode *vp, int lockflag, struct proc *p)); diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index c32f07a..8d1d5c0 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.18 (Berkeley) 5/26/95 - * $Id: ffs_alloc.c,v 1.42 1997/11/07 08:53:34 phk Exp $ + * $Id: ffs_alloc.c,v 1.43 1997/11/22 07:00:40 bde Exp $ */ #include "opt_quota.h" @@ -58,6 +58,9 @@ typedef ufs_daddr_t allocfcn_t __P((struct inode *ip, int cg, ufs_daddr_t bpref, static ufs_daddr_t ffs_alloccg __P((struct inode *, int, ufs_daddr_t, int)); static ufs_daddr_t ffs_alloccgblk __P((struct fs *, struct cg *, ufs_daddr_t)); +#ifdef DIAGNOSTIC +static int ffs_checkblk __P((struct inode *, ufs_daddr_t, long)); +#endif static void ffs_clusteracct __P((struct fs *, struct cg *, ufs_daddr_t, int)); #ifdef notyet @@ -335,7 +338,7 @@ nospace: static int doasyncfree = 1; SYSCTL_INT(_vfs_ffs, FFS_ASYNCFREE, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, ""); -int doreallocblks = 1; +static int doreallocblks = 1; SYSCTL_INT(_vfs_ffs, FFS_REALLOCBLKS, doreallocblks, CTLFLAG_RW, &doreallocblks, 0, ""); static int prtrealloc = 0; @@ -1357,7 +1360,7 @@ ffs_blkfree(ip, bno, size) * Verify allocation of a block or fragment. Returns true if block or * fragment is allocated, false if it is free. */ -int +static int ffs_checkblk(ip, bno, size) struct inode *ip; ufs_daddr_t bno; diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 38701c5..5a9737a 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.6 (Berkeley) 3/30/95 - * $Id: ffs_extern.h,v 1.19 1997/10/16 10:49:22 phk Exp $ + * $Id: ffs_extern.h,v 1.20 1997/10/16 20:32:34 phk Exp $ */ #ifndef _UFS_FFS_EXTERN_H @@ -93,11 +93,6 @@ int ffs_vfree __P((struct vnode *, ino_t, int)); int ffs_vget __P((struct mount *, ino_t, struct vnode **)); int ffs_vptofh __P((struct vnode *, struct fid *)); -#ifdef DIAGNOSTIC -int ffs_checkblk __P((struct inode *, ufs_daddr_t, long)); -void ffs_checkoverlap __P((struct buf *, struct inode *)); -#endif - extern vop_t **ffs_vnodeop_p; extern vop_t **ffs_specop_p; extern vop_t **ffs_fifoop_p; diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index ba15a10..90ff5c1 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95 - * $Id: ffs_subr.c,v 1.13 1997/10/16 10:49:30 phk Exp $ + * $Id: ffs_subr.c,v 1.14 1997/11/18 15:10:38 bde Exp $ */ #include <sys/param.h> @@ -49,6 +49,10 @@ #include <ufs/ufs/inode.h> #include <ufs/ffs/ffs_extern.h> +#if defined(KERNEL) && defined(DIAGNOSTIC) && defined(DDB) +static void ffs_checkoverlap __P((struct buf *, struct inode *)); +#endif + /* * Return buffer with the contents of block "offset" from the beginning of * directory "ip". If "res" is non-zero, fill it in with a pointer to the @@ -121,7 +125,7 @@ ffs_fragacct(fs, fragmap, fraglist, cnt) } #if defined(KERNEL) && defined(DIAGNOSTIC) && defined(DDB) -void +static void ffs_checkoverlap(bp, ip) struct buf *bp; struct inode *ip; |
