From 493c516a23a0a4eff42469f6dea926f86a9151d2 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 1 Jun 2004 22:19:30 +0000 Subject: [PATCH] ANSIfication. No operational changes. Submitted-by: Tim Wickberg --- sys/kern/subr_prof.c | 15 ++++----------- sys/kern/vfs_bio.c | 31 +++++++++++++------------------ sys/kern/vfs_cluster.c | 40 +++++++++------------------------------- 3 files changed, 26 insertions(+), 60 deletions(-) diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 1a9c348d65..545ec2615d 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -32,7 +32,7 @@ * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 * $FreeBSD: src/sys/kern/subr_prof.c,v 1.32.2.2 2000/08/03 00:09:32 ps Exp $ - * $DragonFly: src/sys/kern/subr_prof.c,v 1.8 2003/10/12 23:38:53 hmp Exp $ + * $DragonFly: src/sys/kern/subr_prof.c,v 1.9 2004/06/01 22:19:30 dillon Exp $ */ #include @@ -79,8 +79,7 @@ nullfunc_profiled() #endif /* GUPROF */ static void -kmstartup(dummy) - void *dummy; +kmstartup(void *dummy) { char *cp; struct gmonparam *p = &_gmonparam; @@ -394,10 +393,7 @@ profil(struct profil_args *uap) * inaccurate. */ void -addupc_intr(p, pc, ticks) - struct proc *p; - u_long pc; - u_int ticks; +addupc_intr(struct proc *p, u_long pc, u_int ticks) { struct uprof *prof; caddr_t addr; @@ -424,10 +420,7 @@ addupc_intr(p, pc, ticks) * update fails, we simply turn off profiling. */ void -addupc_task(p, pc, ticks) - struct proc *p; - u_long pc; - u_int ticks; +addupc_task(struct proc *p, u_long pc, u_int ticks) { struct uprof *prof; caddr_t addr; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 83cc0d9b5d..e322a7810e 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -12,7 +12,7 @@ * John S. Dyson. * * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.242.2.20 2003/05/28 18:38:10 alc Exp $ - * $DragonFly: src/sys/kern/vfs_bio.c,v 1.27 2004/05/20 22:42:24 dillon Exp $ + * $DragonFly: src/sys/kern/vfs_bio.c,v 1.28 2004/06/01 22:19:30 dillon Exp $ */ /* @@ -757,8 +757,7 @@ bwrite(struct buf * bp) * Complete a background write started from bwrite. */ static void -vfs_backgroundwritedone(bp) - struct buf *bp; +vfs_backgroundwritedone(struct buf *bp) { struct buf *origbp; @@ -816,7 +815,7 @@ vfs_backgroundwritedone(bp) * out synchronously. */ void -bdwrite(struct buf * bp) +bdwrite(struct buf *bp) { if (BUF_REFCNT(bp) == 0) panic("bdwrite: buffer is not busy"); @@ -894,8 +893,7 @@ bdwrite(struct buf * bp) * The buffer must be on QUEUE_NONE. */ void -bdirty(bp) - struct buf *bp; +bdirty(struct buf *bp) { KASSERT(bp->b_qindex == QUEUE_NONE, ("bdirty: buffer %p still on queue %d", bp, bp->b_qindex)); bp->b_flags &= ~(B_READ|B_RELBUF); @@ -921,8 +919,7 @@ bdirty(bp) */ void -bundirty(bp) - struct buf *bp; +bundirty(struct buf *bp) { KASSERT(bp->b_qindex == QUEUE_NONE, ("bundirty: buffer %p still on queue %d", bp, bp->b_qindex)); @@ -1372,8 +1369,7 @@ bqrelse(struct buf * bp) } static void -vfs_vmio_release(bp) - struct buf *bp; +vfs_vmio_release(struct buf *bp) { int i, s; vm_page_t m; @@ -2759,7 +2755,7 @@ biowait(struct buf * bp) * b_dev to NODEV. */ void -biodone(struct buf * bp) +biodone(struct buf *bp) { int s, error; @@ -2937,7 +2933,7 @@ biodone(struct buf * bp) * consistant. */ void -vfs_unbusy_pages(struct buf * bp) +vfs_unbusy_pages(struct buf *bp) { int i; @@ -3023,7 +3019,7 @@ vfs_page_set_valid(struct buf *bp, vm_ooffset_t off, int pageno, vm_page_t m) * and should be ignored. */ void -vfs_busy_pages(struct buf * bp, int clear_modify) +vfs_busy_pages(struct buf *bp, int clear_modify) { int i, bogus; @@ -3110,7 +3106,7 @@ retry: * just go ahead and clean through to b_bufsize. */ static void -vfs_clean_pages(struct buf * bp) +vfs_clean_pages(struct buf *bp) { int i; @@ -3240,7 +3236,7 @@ vfs_bio_clrbuf(struct buf *bp) * not associated with a file object. */ void -vm_hold_load_pages(struct buf * bp, vm_offset_t from, vm_offset_t to) +vm_hold_load_pages(struct buf *bp, vm_offset_t from, vm_offset_t to) { vm_offset_t pg; vm_page_t p; @@ -3278,7 +3274,7 @@ tryagain: } void -vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to) +vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to) { vm_offset_t pg; vm_page_t p; @@ -3378,8 +3374,7 @@ retry: * We also invalidate the TLB entries and restore the original b_addr. */ void -vunmapbuf(bp) - struct buf *bp; +vunmapbuf(struct buf *bp) { int pidx; int npages; diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 1ba3c2cb4f..192344cc14 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -34,7 +34,7 @@ * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 * $FreeBSD: src/sys/kern/vfs_cluster.c,v 1.92.2.9 2001/11/18 07:10:59 dillon Exp $ - * $DragonFly: src/sys/kern/vfs_cluster.c,v 1.9 2004/05/10 10:51:32 hmp Exp $ + * $DragonFly: src/sys/kern/vfs_cluster.c,v 1.10 2004/06/01 22:19:30 dillon Exp $ */ #include "opt_debug_cluster.h" @@ -86,14 +86,8 @@ extern int cluster_pbuf_freecnt; * This replaces bread. */ int -cluster_read(vp, filesize, lblkno, size, totread, seqcount, bpp) - struct vnode *vp; - u_quad_t filesize; - daddr_t lblkno; - long size; - long totread; - int seqcount; - struct buf **bpp; +cluster_read(struct vnode *vp, u_quad_t filesize, daddr_t lblkno, + long size, long totread, int seqcount, struct buf **bpp) { struct buf *bp, *rbp, *reqbp; daddr_t blkno, origblkno; @@ -302,14 +296,8 @@ single_block_read: * and then parcel them up into logical blocks in the buffer hash table. */ static struct buf * -cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp) - struct vnode *vp; - u_quad_t filesize; - daddr_t lbn; - daddr_t blkno; - long size; - int run; - struct buf *fbp; +cluster_rbuild(struct vnode *vp, u_quad_t filesize, daddr_t lbn, + daddr_t blkno, long size, int run, struct buf *fbp) { struct buf *bp, *tbp; daddr_t bn; @@ -510,8 +498,7 @@ cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp) * that we will need to shift around. */ void -cluster_callback(bp) - struct buf *bp; +cluster_callback(struct buf *bp) { struct buf *nbp, *tbp; int error = 0; @@ -593,10 +580,7 @@ cluster_wbuild_wb(struct vnode *vp, long size, daddr_t start_lbn, int len) * 4. end of a cluster - asynchronously write cluster */ void -cluster_write(bp, filesize, seqcount) - struct buf *bp; - u_quad_t filesize; - int seqcount; +cluster_write(struct buf *bp, u_quad_t filesize, int seqcount) { struct vnode *vp; daddr_t lbn; @@ -744,11 +728,7 @@ cluster_write(bp, filesize, seqcount) * the current block (if last_bp == NULL). */ int -cluster_wbuild(vp, size, start_lbn, len) - struct vnode *vp; - long size; - daddr_t start_lbn; - int len; +cluster_wbuild(struct vnode *vp, long size, daddr_t start_lbn, int len) { struct buf *bp, *tbp; int i, j, s; @@ -948,9 +928,7 @@ cluster_wbuild(vp, size, start_lbn, len) * Plus add one additional buffer. */ static struct cluster_save * -cluster_collectbufs(vp, last_bp) - struct vnode *vp; - struct buf *last_bp; +cluster_collectbufs(struct vnode *vp, struct buf *last_bp) { struct cluster_save *buflist; struct buf *bp; -- 2.41.0