- ansify function declarations, no binary change

"fine" thib@

6 files changed, 105 insertions, 282 deletions

diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c
index 179d61bf47b..d3152925d3d 100644
--- a/sys/msdosfs/msdosfs_conv.c
+++ b/sys/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_conv.c,v 1.13 2004/05/14 04:05:05 tedu Exp $	*/
+/*	$OpenBSD: msdosfs_conv.c,v 1.14 2009/08/13 22:34:29 jasper Exp $	*/
 /*	$NetBSD: msdosfs_conv.c,v 1.24 1997/10/17 11:23:54 ws Exp $	*/
 
 /*-
@@ -94,11 +94,7 @@ u_short lastdtime;
  * file timestamps. The passed in unix time is assumed to be in GMT.
  */
 void
-unix2dostime(tsp, ddp, dtp, dhp)
-	struct timespec *tsp;
-	u_int16_t *ddp;
-	u_int16_t *dtp;
-	u_int8_t *dhp;
+unix2dostime(struct timespec *tsp, u_int16_t *ddp, u_int16_t *dtp, u_int8_t *dhp)
 {
 	uint32_t t;
 	uint32_t days;
@@ -176,11 +172,7 @@ uint32_t lastseconds;
  * not be too efficient.
  */
 void
-dos2unixtime(dd, dt, dh, tsp)
-	u_int dd;
-	u_int dt;
-	u_int dh;
-	struct timespec *tsp;
+dos2unixtime(u_int dd, u_int dt, u_int dh, struct timespec *tsp)
 {
 	uint32_t seconds;
 	uint32_t m, month;
@@ -352,10 +344,7 @@ u2l[256] = {
  * null.
  */
 int
-dos2unixfn(dn, un, lower)
-	u_char dn[11];
-	u_char *un;
-	int lower;
+dos2unixfn(u_char dn[11], u_char *un, int lower)
 {
 	int i;
 	int thislong = 1;
@@ -414,11 +403,7 @@ dos2unixfn(dn, un, lower)
  *	3 if conversion was successful and generation number was inserted
  */
 int
-unix2dosfn(un, dn, unlen, gen)
-	u_char *un;
-	u_char dn[12];
-	int unlen;
-	u_int gen;
+unix2dosfn(u_char *un, u_char dn[12], int unlen, u_int gen)
 {
 	int i, j, l;
 	int conv = 1;
@@ -563,12 +548,7 @@ unix2dosfn(un, dn, unlen, gen)
  *	 i.e. doesn't consist solely of blanks and dots
  */
 int
-unix2winfn(un, unlen, wep, cnt, chksum)
-	u_char *un;
-	int unlen;
-	struct winentry *wep;
-	int cnt;
-	int chksum;
+unix2winfn(u_char *un, int unlen, struct winentry *wep, int cnt, int chksum)
 {
 	u_int8_t *cp;
 	int i;
@@ -628,11 +608,7 @@ done:
  * Returns the checksum or -1 if no match
  */
 int
-winChkName(un, unlen, wep, chksum)
-	u_char *un;
-	int unlen;
-	struct winentry *wep;
-	int chksum;
+winChkName(u_char *un, int unlen, struct winentry *wep, int chksum)
 {
 	u_int8_t *cp;
 	int i;
@@ -696,10 +672,7 @@ winChkName(un, unlen, wep, chksum)
  * Returns the checksum or -1 if impossible
  */
 int
-win2unixfn(wep, dp, chksum)
-	struct winentry *wep;
-	struct dirent *dp;
-	int chksum;
+win2unixfn(struct winentry *wep, struct dirent *dp, int chksum)
 {
 	u_int8_t *cp;
 	u_int8_t *np, *ep = dp->d_name + WIN_MAXLEN;
@@ -802,8 +775,7 @@ win2unixfn(wep, dp, chksum)
  * Compute the checksum of a DOS filename for Win95 use
  */
 u_int8_t
-winChksum(name)
-	u_int8_t *name;
+winChksum(u_int8_t *name)
 {
 	int i;
 	u_int8_t s;
@@ -817,9 +789,7 @@ winChksum(name)
  * Determine the number of slots necessary for Win95 names
  */
 int
-winSlotCnt(un, unlen)
-	u_char *un;
-	int unlen;
+winSlotCnt(u_char *un, int unlen)
 {
 	for (un += unlen; unlen > 0; unlen--)
 		if (*--un != ' ' && *un != '.')
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 634a1d09b7f..ed278b090b7 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.36 2009/07/09 22:29:56 thib Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.37 2009/08/13 22:34:29 jasper Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $	*/
 
 /*-
@@ -78,18 +78,14 @@ static void msdosfs_hashrem(struct denode *);
 
 /*ARGSUSED*/
 int
-msdosfs_init(vfsp)
-	struct vfsconf *vfsp;
+msdosfs_init(struct vfsconf *vfsp)
 {
 	dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, M_WAITOK, &dehash);
 	return (0);
 }
 
 static struct denode *
-msdosfs_hashget(dev, dirclust, diroff)
-	dev_t dev;
-	uint32_t dirclust;
-	uint32_t diroff;
+msdosfs_hashget(dev_t dev, uint32_t dirclust, uint32_t diroff)
 {
 	struct denode *dep;
 	struct proc *p = curproc; /* XXX */
@@ -114,8 +110,7 @@ msdosfs_hashget(dev, dirclust, diroff)
 }
 
 static int
-msdosfs_hashins(dep)
-	struct denode *dep;
+msdosfs_hashins(struct denode *dep)
 {
 	struct denode **depp, *deq;
 
@@ -140,8 +135,7 @@ msdosfs_hashins(dep)
 }
 
 static void
-msdosfs_hashrem(dep)
-	struct denode *dep;
+msdosfs_hashrem(struct denode *dep)
 {
 	struct denode *deq;
 
@@ -170,11 +164,8 @@ msdosfs_hashrem(dep)
  * depp	     - returns the address of the gotten denode.
  */
 int
-deget(pmp, dirclust, diroffset, depp)
-	struct msdosfsmount *pmp;	/* so we know the maj/min number */
-	uint32_t dirclust;		/* cluster this dir entry came from */
-	uint32_t diroffset;		/* index of entry within the cluster */
-	struct denode **depp;		/* returns the addr of the gotten denode */
+deget(struct msdosfsmount *pmp, uint32_t dirclust, uint32_t diroffset,
+    struct denode **depp)
 {
 	int error;
 	extern int (**msdosfs_vnodeop_p)(void *);
@@ -335,9 +326,7 @@ retry:
 }
 
 int
-deupdat(dep, waitfor)
-	struct denode *dep;
-	int waitfor;
+deupdat(struct denode *dep, int waitfor)
 {
 	struct buf *bp;
 	struct direntry *dirp;
@@ -371,12 +360,8 @@ deupdat(dep, waitfor)
  * Truncate the file described by dep to the length specified by length.
  */
 int
-detrunc(dep, length, flags, cred, p)
-	struct denode *dep;
-	uint32_t length;
-	int flags;
-	struct ucred *cred;
-	struct proc *p;
+detrunc(struct denode *dep, uint32_t length, int flags, struct ucred *cred,
+    struct proc *p)
 {
 	int error;
 	int allerror;
@@ -517,10 +502,7 @@ detrunc(dep, length, flags, cred, p)
  * Extend the file described by dep to length specified by length.
  */
 int
-deextend(dep, length, cred)
-	struct denode *dep;
-	uint32_t length;
-	struct ucred *cred;
+deextend(struct denode *dep, uint32_t length, struct ucred *cred)
 {
 	struct msdosfsmount *pmp = dep->de_pmp;
 	uint32_t count;
@@ -566,8 +548,7 @@ deextend(dep, length, cred)
  * been moved to a new directory.
  */
 void
-reinsert(dep)
-	struct denode *dep;
+reinsert(struct denode *dep)
 {
 	/*
 	 * Fix up the denode cache.  If the denode is for a directory,
@@ -584,8 +565,7 @@ reinsert(dep)
 }
 
 int
-msdosfs_reclaim(v)
-	void *v;
+msdosfs_reclaim(void *v)
 {
 	struct vop_reclaim_args *ap = v;
 	struct vnode *vp = ap->a_vp;
@@ -623,8 +603,7 @@ msdosfs_reclaim(v)
 }
 
 int
-msdosfs_inactive(v)
-	void *v;
+msdosfs_inactive(void *v)
 {
 	struct vop_inactive_args *ap = v;
 	struct vnode *vp = ap->a_vp;
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index 9f8d1dab8d3..167e56eac84 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_fat.c,v 1.20 2009/01/05 01:14:40 krw Exp $	*/
+/*	$OpenBSD: msdosfs_fat.c,v 1.21 2009/08/13 22:34:29 jasper Exp $	*/
 /*	$NetBSD: msdosfs_fat.c,v 1.26 1997/10/17 11:24:02 ws Exp $	*/
 
 /*-
@@ -94,12 +94,8 @@ int chainalloc(struct msdosfsmount *, uint32_t, uint32_t, uint32_t, uint32_t *,
 		    uint32_t *);
 
 static void
-fatblock(pmp, ofs, bnp, sizep, bop)
-	struct msdosfsmount *pmp;
-	uint32_t ofs;
-	uint32_t *bnp;
-	uint32_t *sizep;
-	uint32_t *bop;
+fatblock(struct msdosfsmount *pmp, uint32_t ofs, uint32_t *bnp, uint32_t *sizep,
+    uint32_t *bop)
 {
 	uint32_t bn, size;
 
@@ -134,12 +130,8 @@ fatblock(pmp, ofs, bnp, sizep, bop)
  *  If cnp is null, nothing is returned.
  */
 int
-pcbmap(dep, findcn, bnp, cnp, sp)
-	struct denode *dep;
-	uint32_t findcn;		/* file relative cluster to get		 */
-	daddr64_t *bnp;		/* returned filesys relative blk number	 */
-	uint32_t *cnp;		/* returned cluster number		 */
-	int *sp;		/* returned block size			 */
+pcbmap(struct denode *dep, uint32_t findcn, daddr64_t *bnp, uint32_t *cnp,
+    int *sp)
 {
 	int error;
 	uint32_t i;
@@ -280,11 +272,7 @@ hiteof:;
  * for.
  */
 void
-fc_lookup(dep, findcn, frcnp, fsrcnp)
-	struct denode *dep;
-	uint32_t findcn;
-	uint32_t *frcnp;
-	uint32_t *fsrcnp;
+fc_lookup(struct denode *dep, uint32_t findcn, uint32_t *frcnp, uint32_t *fsrcnp)
 {
 	int i;
 	uint32_t cn;
@@ -308,9 +296,7 @@ fc_lookup(dep, findcn, frcnp, fsrcnp)
  * relative cluster frcn and beyond.
  */
 void
-fc_purge(dep, frcn)
-	struct denode *dep;
-	u_int frcn;
+fc_purge(struct denode *dep, u_int frcn)
 {
 	int i;
 	struct fatcache *fcp;
@@ -332,10 +318,7 @@ fc_purge(dep, frcn)
  * fatbn - block number relative to begin of filesystem of the modified fat block.
  */
 void
-updatefats(pmp, bp, fatbn)
-	struct msdosfsmount *pmp;
-	struct buf *bp;
-	uint32_t fatbn;
+updatefats(struct msdosfsmount *pmp, struct buf *bp, uint32_t fatbn)
 {
 	int i;
 	struct buf *bpn;
@@ -421,9 +404,7 @@ updatefats(pmp, bp, fatbn)
  * 
  */
 static __inline void
-usemap_alloc(pmp, cn)
-	struct msdosfsmount *pmp;
-	uint32_t cn;
+usemap_alloc(struct msdosfsmount *pmp, uint32_t cn)
 {
 
 	pmp->pm_inusemap[cn / N_INUSEBITS] |= 1 << (cn % N_INUSEBITS);
@@ -431,9 +412,7 @@ usemap_alloc(pmp, cn)
 }
 
 static __inline void
-usemap_free(pmp, cn)
-	struct msdosfsmount *pmp;
-	uint32_t cn;
+usemap_free(struct msdosfsmount *pmp, uint32_t cn)
 {
 
 	pmp->pm_freeclustercount++;
@@ -441,10 +420,7 @@ usemap_free(pmp, cn)
 }
 
 int
-clusterfree(pmp, cluster, oldcnp)
-	struct msdosfsmount *pmp;
-	uint32_t cluster;
-	uint32_t *oldcnp;
+clusterfree(struct msdosfsmount *pmp, uint32_t cluster, uint32_t *oldcnp)
 {
 	int error;
 	uint32_t oldcn;
@@ -485,12 +461,8 @@ clusterfree(pmp, cluster, oldcnp)
  * the msdosfsmount structure. This is left to the caller.
  */
 int
-fatentry(function, pmp, cn, oldcontents, newcontents)
-	int function;
-	struct msdosfsmount *pmp;
-	uint32_t cn;
-	uint32_t *oldcontents;
-	uint32_t newcontents;
+fatentry(int function, struct msdosfsmount *pmp, uint32_t cn, uint32_t *oldcontents,
+    uint32_t newcontents)
 {
 	int error;
 	uint32_t readcn;
@@ -592,11 +564,7 @@ fatentry(function, pmp, cn, oldcontents, newcontents)
  * fillwith - what to write into fat entry of last cluster
  */
 static int
-fatchain(pmp, start, count, fillwith)
-	struct msdosfsmount *pmp;
-	uint32_t start;
-	uint32_t count;
-	uint32_t fillwith;
+fatchain(struct msdosfsmount *pmp, uint32_t start, uint32_t count, uint32_t fillwith)
 {
 	int error;
 	uint32_t bn, bo, bsize, byteoffset, readcn, newc;
@@ -667,10 +635,7 @@ fatchain(pmp, start, count, fillwith)
  * count - maximum interesting length
  */
 int
-chainlength(pmp, start, count)
-	struct msdosfsmount *pmp;
-	uint32_t start;
-	uint32_t count;
+chainlength(struct msdosfsmount *pmp, uint32_t start, uint32_t count)
 {
 	uint32_t idx, max_idx;
 	u_int map;
@@ -712,13 +677,8 @@ chainlength(pmp, start, count)
  * got	      - how many clusters were actually allocated.
  */
 int
-chainalloc(pmp, start, count, fillwith, retcluster, got)
-	struct msdosfsmount *pmp;
-	uint32_t start;
-	uint32_t count;
-	uint32_t fillwith;
-	uint32_t *retcluster;
-	uint32_t *got;
+chainalloc(struct msdosfsmount *pmp, uint32_t start, uint32_t count,
+    uint32_t fillwith, uint32_t *retcluster, uint32_t *got)
 {
 	int error;
 	uint32_t cl, n;
@@ -750,13 +710,8 @@ chainalloc(pmp, start, count, fillwith, retcluster, got)
  * got	      - how many clusters were actually allocated.
  */
 int
-clusteralloc(pmp, start, count, fillwith, retcluster, got)
-	struct msdosfsmount *pmp;
-	uint32_t start;
-	uint32_t count;
-	uint32_t fillwith;
-	uint32_t *retcluster;
-	uint32_t *got;
+clusteralloc(struct msdosfsmount *pmp, uint32_t start, uint32_t count,
+    uint32_t fillwith, uint32_t *retcluster, uint32_t *got)
 {
 	uint32_t idx;
 	uint32_t len, newst, foundl, cn, l;
@@ -841,9 +796,7 @@ clusteralloc(pmp, start, count, fillwith, retcluster, got)
  *		  freed.
  */
 int
-freeclusterchain(pmp, cluster)
-	struct msdosfsmount *pmp;
-	uint32_t cluster;
+freeclusterchain(struct msdosfsmount *pmp, uint32_t cluster)
 {
 	int error;
 	struct buf *bp = NULL;
@@ -902,8 +855,7 @@ freeclusterchain(pmp, cluster)
  * found turn off its corresponding bit in the pm_inusemap.
  */
 int
-fillinusemap(pmp)
-	struct msdosfsmount *pmp;
+fillinusemap(struct msdosfsmount *pmp)
 {
 	struct buf *bp = NULL;
 	uint32_t cn, readcn;
@@ -968,12 +920,8 @@ fillinusemap(pmp)
  * field.  This is left for the caller to do.
  */
 int
-extendfile(dep, count, bpp, ncp, flags)
-	struct denode *dep;
-	uint32_t count;
-	struct buf **bpp;
-	uint32_t *ncp;
-	int flags;
+extendfile(struct denode *dep, uint32_t count, struct buf **bpp, uint32_t *ncp,
+    int flags)
 {
 	int error;
 	uint32_t frcn;
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index b74c9717515..c84e13de455 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_lookup.c,v 1.21 2009/07/09 22:29:56 thib Exp $	*/
+/*	$OpenBSD: msdosfs_lookup.c,v 1.22 2009/08/13 22:34:29 jasper Exp $	*/
 /*	$NetBSD: msdosfs_lookup.c,v 1.34 1997/10/18 22:12:27 ws Exp $	*/
 
 /*-
@@ -78,8 +78,7 @@
  * memory denode's will be in synch.
  */
 int
-msdosfs_lookup(v)
-	void *v;
+msdosfs_lookup(void *v)
 {
 	struct vop_lookup_args *ap = v;
 	struct vnode *vdp = ap->a_dvp;
@@ -593,11 +592,8 @@ foundroot:;
  * cnp  - componentname needed for Win95 long filenames
  */
 int
-createde(dep, ddep, depp, cnp)
-	struct denode *dep;
-	struct denode *ddep;
-	struct denode **depp;
-	struct componentname *cnp;
+createde(struct denode *dep, struct denode *ddep, struct denode **depp,
+    struct componentname *cnp)
 {
 	int error;
 	uint32_t dirclust, diroffset;
@@ -720,8 +716,7 @@ createde(dep, ddep, depp, cnp)
  * return 0 if not empty or error.
  */
 int
-dosdirempty(dep)
-	struct denode *dep;
+dosdirempty(struct denode *dep)
 {
 	int blsize;
 	int error;
@@ -797,9 +792,7 @@ dosdirempty(dep)
  * The target inode is always unlocked on return.
  */
 int
-doscheckpath(source, target)
-	struct denode *source;
-	struct denode *target;
+doscheckpath(struct denode *source, struct denode *target)
 {
 	uint32_t scn;
 	struct msdosfsmount *pmp;
@@ -886,11 +879,8 @@ out:;
  * directory entry within the block.
  */
 int
-readep(pmp, dirclust, diroffset, bpp, epp)
-	struct msdosfsmount *pmp;
-	uint32_t dirclust, diroffset;
-	struct buf **bpp;
-	struct direntry **epp;
+readep(struct msdosfsmount *pmp, uint32_t dirclust, uint32_t diroffset,
+    struct buf **bpp, struct direntry **epp)
 {
 	int error;
 	daddr64_t bn;
@@ -919,10 +909,7 @@ readep(pmp, dirclust, diroffset, bpp, epp)
  * entry within the block.
  */
 int
-readde(dep, bpp, epp)
-	struct denode *dep;
-	struct buf **bpp;
-	struct direntry **epp;
+readde(struct denode *dep, struct buf **bpp, struct direntry **epp)
 {
 
 	return (readep(dep->de_pmp, dep->de_dirclust, dep->de_diroffset,
@@ -936,11 +923,12 @@ readde(dep, bpp, epp)
  * and will truncate the file to 0 length.  When the vnode containing the
  * denode is needed for some other purpose by VFS it will call
  * msdosfs_reclaim() which will remove the denode from the denode cache.
+ *
+ * pdep - directory where the entry is removed
+ * dep - file to be removed
  */
 int
-removede(pdep, dep)
-	struct denode *pdep;	/* directory where the entry is removed */
-	struct denode *dep;	/* file to be removed */
+removede(struct denode *pdep, struct denode *dep)
 {
 	int error;
 	struct direntry *ep;
@@ -1005,10 +993,7 @@ removede(pdep, dep)
  * Create a unique DOS name in dvp
  */
 int
-uniqdosname(dep, cnp, cp)
-	struct denode *dep;
-	struct componentname *cnp;
-	u_char *cp;
+uniqdosname(struct denode *dep, struct componentname *cnp, u_char *cp)
 {
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct direntry *dentp;
@@ -1071,8 +1056,7 @@ uniqdosname(dep, cnp, cp)
  * Find any Win'95 long filename entry in directory dep
  */
 int
-findwin95(dep)
-	struct denode *dep;
+findwin95(struct denode *dep)
 {
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct direntry *dentp;
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 1802e8c2a6a..9db98780854 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vfsops.c,v 1.51 2009/01/05 01:14:40 krw Exp $	*/
+/*	$OpenBSD: msdosfs_vfsops.c,v 1.52 2009/08/13 22:34:29 jasper Exp $	*/
 /*	$NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $	*/
 
 /*-
@@ -93,12 +93,8 @@ int msdosfs_sync_vnode(struct vnode *, void *);
  * special file to treat as a filesystem. 
  */
 int
-msdosfs_mount(mp, path, data, ndp, p)
-	struct mount *mp;
-	const char *path;
-	void *data;
-	struct nameidata *ndp;
-	struct proc *p;
+msdosfs_mount(struct mount *mp, const char *path, void *data,
+    struct nameidata *ndp, struct proc *p)
 {
 	struct vnode *devvp;	  /* vnode for blk device to mount */
 	struct msdosfs_args args; /* will hold data from mount request */
@@ -248,11 +244,8 @@ msdosfs_mount(mp, path, data, ndp, p)
 }
 
 int
-msdosfs_mountfs(devvp, mp, p, argp)
-	struct vnode *devvp;
-	struct mount *mp;
-	struct proc *p;
-	struct msdosfs_args *argp;
+msdosfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
+    struct msdosfs_args *argp)
 {
 	struct msdosfsmount *pmp;
 	struct buf *bp;
@@ -566,10 +559,7 @@ error_exit:
 }
 
 int
-msdosfs_start(mp, flags, p)
-	struct mount *mp;
-	int flags;
-	struct proc *p;
+msdosfs_start(struct mount *mp, int flags, struct proc *p)
 {
 
 	return (0);
@@ -579,10 +569,7 @@ msdosfs_start(mp, flags, p)
  * Unmount the filesystem described by mp.
  */
 int
-msdosfs_unmount(mp, mntflags, p)
-	struct mount *mp;
-	int mntflags;
-	struct proc *p;
+msdosfs_unmount(struct mount *mp, int mntflags,struct proc *p)
 {
 	struct msdosfsmount *pmp;
 	int error, flags;
@@ -612,9 +599,7 @@ msdosfs_unmount(mp, mntflags, p)
 }
 
 int
-msdosfs_root(mp, vpp)
-	struct mount *mp;
-	struct vnode **vpp;
+msdosfs_root(struct mount *mp, struct vnode **vpp)
 {
 	struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
 	struct denode *ndep;
@@ -633,10 +618,7 @@ msdosfs_root(mp, vpp)
 }
 
 int
-msdosfs_statfs(mp, sbp, p)
-	struct mount *mp;
-	struct statfs *sbp;
-	struct proc *p;
+msdosfs_statfs(struct mount *mp, struct statfs *sbp, struct proc *p)
 {
 	struct msdosfsmount *pmp;
 
@@ -694,11 +676,7 @@ msdosfs_sync_vnode(struct vnode *vp, void *arg)
 
 
 int
-msdosfs_sync(mp, waitfor, cred, p)
-	struct mount *mp;
-	int waitfor;
-	struct ucred *cred;
-	struct proc *p;
+msdosfs_sync(struct mount *mp, int waitfor, struct ucred *cred, struct proc *p)
 {
 	struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
 	struct msdosfs_sync_arg msa;
@@ -739,10 +717,7 @@ msdosfs_sync(mp, waitfor, cred, p)
 }
 
 int
-msdosfs_fhtovp(mp, fhp, vpp)
-	struct mount *mp;
-	struct fid *fhp;
-	struct vnode **vpp;
+msdosfs_fhtovp(struct mount *mp, struct fid *fhp, struct vnode **vpp)
 {
 	struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
 	struct defid *defhp = (struct defid *) fhp;
@@ -759,9 +734,7 @@ msdosfs_fhtovp(mp, fhp, vpp)
 }
 
 int
-msdosfs_vptofh(vp, fhp)
-	struct vnode *vp;
-	struct fid *fhp;
+msdosfs_vptofh(struct vnode *vp, struct fid *fhp)
 {
 	struct denode *dep;
 	struct defid *defhp;
@@ -776,11 +749,8 @@ msdosfs_vptofh(vp, fhp)
 }
 
 int
-msdosfs_check_export(mp, nam, exflagsp, credanonp)
-	register struct mount *mp;
-	struct mbuf *nam;
-	int *exflagsp;
-	struct ucred **credanonp;
+msdosfs_check_export(struct mount *mp, struct mbuf *nam, int *exflagsp,
+    struct ucred **credanonp)
 {
 	register struct netcred *np;
 	register struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index cdcc986ba06..b9302c98265 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.70 2009/08/13 15:00:14 jasper Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.71 2009/08/13 22:34:29 jasper Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -103,8 +103,7 @@ static uint32_t fileidhash(uint64_t);
  * only if the SAVESTART bit in cn_flags is clear on success.
  */
 int
-msdosfs_create(v)
-	void *v;
+msdosfs_create(void *v)
 {
 	struct vop_create_args *ap = v;
 	struct componentname *cnp = ap->a_cnp;
@@ -168,8 +167,7 @@ bad:
 }
 
 int
-msdosfs_mknod(v)
-	void *v;
+msdosfs_mknod(void *v)
 {
 	struct vop_mknod_args *ap = v;
 
@@ -179,8 +177,7 @@ msdosfs_mknod(v)
 }
 
 int
-msdosfs_open(v)
-	void *v;
+msdosfs_open(void *v)
 {
 #if 0
 	struct vop_open_args /* {
@@ -195,8 +192,7 @@ msdosfs_open(v)
 }
 
 int
-msdosfs_close(v)
-	void *v;
+msdosfs_close(void *v)
 {
 	struct vop_close_args *ap = v;
 	struct vnode *vp = ap->a_vp;
@@ -211,8 +207,7 @@ msdosfs_close(v)
 }
 
 int
-msdosfs_access(v)
-	void *v;
+msdosfs_access(void *v)
 {
 	struct vop_access_args *ap = v;
 	struct denode *dep = VTODE(ap->a_vp);
@@ -235,8 +230,7 @@ msdosfs_access(v)
 }
 
 int
-msdosfs_getattr(v)
-	void *v;
+msdosfs_getattr(void *v)
 {
 	struct vop_getattr_args *ap = v;
 	struct denode *dep = VTODE(ap->a_vp);
@@ -337,8 +331,7 @@ msdosfs_getattr(v)
 }
 
 int
-msdosfs_setattr(v)
-	void *v;
+msdosfs_setattr(void *v)
 {
 	struct vop_setattr_args *ap = v;
 	int error = 0;
@@ -424,8 +417,7 @@ msdosfs_setattr(v)
 }
 
 int
-msdosfs_read(v)
-	void *v;
+msdosfs_read(void *v)
 {
 	struct vop_read_args *ap = v;
 	int error = 0;
@@ -510,8 +502,7 @@ msdosfs_read(v)
  * Write data to a file or directory.
  */
 int
-msdosfs_write(v)
-	void *v;
+msdosfs_write(void *v)
 {
 	struct vop_write_args *ap = v;
 	int n;
@@ -701,8 +692,7 @@ errexit:
 }
 
 int
-msdosfs_ioctl(v)
-	void *v;
+msdosfs_ioctl(void *v)
 {
 #if 0
 	struct vop_ioctl_args /* {
@@ -719,8 +709,7 @@ msdosfs_ioctl(v)
 }
 
 int
-msdosfs_poll(v)
-	void *v;
+msdosfs_poll(void *v)
 {
 	struct vop_poll_args *ap = v;
 
@@ -734,8 +723,7 @@ msdosfs_poll(v)
  * could just do a sync if they try an fsync on a directory file.
  */
 int
-msdosfs_fsync(v)
-	void *v;
+msdosfs_fsync(void *v)
 {
 	struct vop_fsync_args *ap = v;
 	struct vnode *vp = ap->a_vp;
@@ -751,8 +739,7 @@ msdosfs_fsync(v)
  * could just do a sync if they try an fsync on a directory file.
  */
 int
-msdosfs_remove(v)
-	void *v;
+msdosfs_remove(void *v)
 {
 	struct vop_remove_args *ap = v;
 	struct denode *dep = VTODE(ap->a_vp);
@@ -781,8 +768,7 @@ msdosfs_remove(v)
  * have to free it before we return the error.
  */
 int
-msdosfs_link(v)
-	void *v;
+msdosfs_link(void *v)
 {
 	struct vop_link_args *ap = v;
 
@@ -845,8 +831,7 @@ msdosfs_link(v)
  * for each rename done.
  */
 int
-msdosfs_rename(v)
-	void *v;
+msdosfs_rename(void *v)
 {
 	struct vop_rename_args *ap = v;
 	struct vnode *tvp = ap->a_tvp;
@@ -1182,8 +1167,7 @@ struct {
 };
 
 int
-msdosfs_mkdir(v)
-	void *v;
+msdosfs_mkdir(void *v)
 {
 	struct vop_mkdir_args *ap = v;
 	struct componentname *cnp = ap->a_cnp;
@@ -1292,8 +1276,7 @@ bad2:
 }
 
 int
-msdosfs_rmdir(v)
-	void *v;
+msdosfs_rmdir(void *v)
 {
 	struct vop_rmdir_args *ap = v;
 	register struct vnode *vp = ap->a_vp;
@@ -1358,8 +1341,7 @@ out:
  * DOS filesystems don't know what symlinks are.
  */
 int
-msdosfs_symlink(v)
-	void *v;
+msdosfs_symlink(void *v)
 {
 	struct vop_symlink_args *ap = v;
 
@@ -1369,8 +1351,7 @@ msdosfs_symlink(v)
 }
 
 int
-msdosfs_readdir(v)
-	void *v;
+msdosfs_readdir(void *v)
 {
 	struct vop_readdir_args *ap = v;
 	int error = 0;
@@ -1642,8 +1623,7 @@ out:
  * DOS filesystems don't know what symlinks are.
  */
 int
-msdosfs_readlink(v)
-	void *v;
+msdosfs_readlink(void *v)
 {
 #if 0
 	struct vop_readlink_args /* {
@@ -1657,8 +1637,7 @@ msdosfs_readlink(v)
 }
 
 int
-msdosfs_lock(v)
-	void *v;
+msdosfs_lock(void *v)
 {
 	struct vop_lock_args *ap = v;
 	struct vnode *vp = ap->a_vp;
@@ -1667,8 +1646,7 @@ msdosfs_lock(v)
 }
 
 int
-msdosfs_unlock(v)
-	void *v;
+msdosfs_unlock(void *v)
 {
 	struct vop_unlock_args *ap = v;
 	struct vnode *vp = ap->a_vp;
@@ -1677,8 +1655,7 @@ msdosfs_unlock(v)
 }
 
 int
-msdosfs_islocked(v)
-	void *v;
+msdosfs_islocked(void *v)
 {
 	struct vop_islocked_args *ap = v;
 
@@ -1693,8 +1670,7 @@ msdosfs_islocked(v)
  * bnp - address of where to return the filesystem relative block number
  */
 int
-msdosfs_bmap(v)
-	void *v;
+msdosfs_bmap(void *v)
 {
 	struct vop_bmap_args *ap = v;
 	struct denode *dep = VTODE(ap->a_vp);
@@ -1714,8 +1690,7 @@ msdosfs_bmap(v)
 }
 
 int
-msdosfs_strategy(v)
-	void *v;
+msdosfs_strategy(void *v)
 {
 	struct vop_strategy_args *ap = v;
 	struct buf *bp = ap->a_bp;
@@ -1759,8 +1734,7 @@ msdosfs_strategy(v)
 }
 
 int
-msdosfs_print(v)
-	void *v;
+msdosfs_print(void *v)
 {
 	struct vop_print_args *ap = v;
 	struct denode *dep = VTODE(ap->a_vp);
@@ -1780,8 +1754,7 @@ msdosfs_print(v)
 }
 
 int
-msdosfs_advlock(v)
-	void *v;
+msdosfs_advlock(void *v)
 {
 	struct vop_advlock_args *ap = v;
 	register struct denode *dep = VTODE(ap->a_vp);
@@ -1791,8 +1764,7 @@ msdosfs_advlock(v)
 }
 
 int
-msdosfs_pathconf(v)
-	void *v;
+msdosfs_pathconf(void *v)
 {
 	struct vop_pathconf_args *ap = v;
 	struct msdosfsmount *pmp = VTODE(ap->a_vp)->de_pmp;