 @@ -1,14 +1,14 @@
-/*	$NetBSD: advfsops.c,v 1.55 2009/03/14 15:36:21 dsl Exp $	*/
+/*	$NetBSD: advfsops.c,v 1.56 2009/03/15 17:15:57 cegger Exp $	*/
 /*
  * Copyright (c) 1994 Christian E. Hopps
  * Copyright (c) 1996 Matthias Scheler
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.55 2009/03/14 15:36:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.56 2009/03/15 17:15:57 cegger Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 @@ -721,39 +721,39 @@ adosfs_vptofh(struct vnode *vp, struct f
 	return(0);
+}
 int
 adosfs_sync(struct mount *mp, int waitfor, kauth_cred_t uc)
+{
 #ifdef ADOSFS_DIAGNOSTIC
 	printf("ad_sync(%x, %x)\n", mp, waitfor);
 #endif
 	return(0);
+}
 void
-adosfs_init()
+adosfs_init(void)
+{
 	malloc_type_attach(M_ADOSFSMNT);
 	malloc_type_attach(M_ANODE);
 	malloc_type_attach(M_ADOSFSBITMAP);
 	pool_init(&adosfs_node_pool, sizeof(struct anode), 0, 0, 0, "adosndpl",
 	    &pool_allocator_nointr, IPL_NONE);
 	simple_lock_init(&adosfs_hashlock);
+}
 void
-adosfs_done()
+adosfs_done(void)
+{
 	pool_destroy(&adosfs_node_pool);
 	malloc_type_detach(M_ADOSFSBITMAP);
 	malloc_type_detach(M_ANODE);
 	malloc_type_detach(M_ADOSFSMNT);
+}
 /*
  * vfs generic function call table
  */
 extern const struct vnodeopv_desc adosfs_vnodeop_opv_desc;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msdosfs_conv.c,v 1.6 2009/03/14 15:36:21 dsl Exp $	*/
+/*	$NetBSD: msdosfs_conv.c,v 1.7 2009/03/15 17:15:57 cegger Exp $	*/
 /*-
  * Copyright (C) 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -38,27 +38,27 @@
  * it, and don't remove this notice.
+ *
  * This software is provided "as is".
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
+ *
  * October 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.6 2009/03/14 15:36:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.7 2009/03/15 17:15:57 cegger Exp $");
 /*
  * System include files.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/dirent.h>
 #include <sys/vnode.h>
 /*
  * MSDOSFS include files.
 @@ -334,30 +334,27 @@ u2l[256] = {
 /*
  * DOS filenames are made of 2 parts, the name part and the extension part.
  * The name part is 8 characters long and the extension part is 3
  * characters long.  They may contain trailing blanks if the name or
  * extension are not long enough to fill their respective fields.
  */
 /*
  * Convert a DOS filename to a unix filename. And, return the number of
  * characters in the resulting unix filename excluding the terminating
  * null.
  */
 int
-dos2unixfn(dn, un, lower)
+dos2unixfn(u_char dn[11], u_char *un, int lower)
 	u_char dn[11];
 	u_char *un;
 	int lower;
+{
 	int i, j;
 	int thislong = 1;
 	u_char c;
 	/*
 	 * If first char of the filename is SLOT_E5 (0x05), then the real
 	 * first char of the filename should be 0xe5. But, they couldn't
 	 * just have a 0xe5 mean 0xe5 because that is used to mean a freed
 	 * directory slot. Another dos quirk.
 	 */
 	if (*dn == SLOT_E5)
 		c = dos2unix[0xe5];
 @@ -400,31 +397,27 @@ dos2unixfn(dn, un, lower)
 /*
  * Convert a unix filename to a DOS filename according to Win95 rules.
  * If applicable and gen is not 0, it is inserted into the converted
  * filename as a generation number.
  * Returns
  *	0 if name couldn't be converted
  *	1 if the converted name is the same as the original
  *	  (no long filename entry necessary for Win95)
  *	2 if conversion was successful
  *	3 if conversion was successful and generation number was inserted
  */
 int
-unix2dosfn(un, dn, unlen, gen)
+unix2dosfn(const u_char *un, u_char dn[12], int unlen, u_int gen)
 	const u_char *un;
 	u_char dn[12];
 	int unlen;
 	u_int gen;
+{
 	int i, j, l;
 	int conv = 1;
 	const u_char *cp, *dp, *dp1;
 	u_char gentext[6], *wcp;
 	int shortlen;
 	/*
 	 * Fill the dos filename string with blanks. These are DOS's pad
 	 * characters.
 	 */
 	for (i = 0; i < 11; i++)
 		dn[i] = ' ';

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msdosfs_denode.c,v 1.35 2009/03/14 21:04:23 dsl Exp $	*/
+/*	$NetBSD: msdosfs_denode.c,v 1.36 2009/03/15 17:15:57 cegger Exp $	*/
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -38,27 +38,27 @@
  * it, and don't remove this notice.
+ *
  * This software is provided "as is".
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
+ *
  * October 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.35 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.36 2009/03/15 17:15:57 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/kernel.h>		/* defines "time" */
 #include <sys/dirent.h>
 #include <sys/namei.h>
 #include <sys/kauth.h>
 @@ -87,72 +87,72 @@ static const struct genfs_ops msdosfs_ge
 	.gop_size = genfs_size,
 	.gop_alloc = msdosfs_gop_alloc,
 	.gop_write = genfs_gop_write,
 	.gop_markupdate = msdosfs_gop_markupdate,
 };
 static struct denode *msdosfs_hashget(dev_t, u_long, u_long, int);
 static void msdosfs_hashins(struct denode *);
 static void msdosfs_hashrem(struct denode *);
 MALLOC_DECLARE(M_MSDOSFSFAT);
 void
-msdosfs_init()
+msdosfs_init(void)
+{
 	malloc_type_attach(M_MSDOSFSMNT);
 	malloc_type_attach(M_MSDOSFSFAT);
 	malloc_type_attach(M_MSDOSFSTMP);
 	pool_init(&msdosfs_denode_pool, sizeof(struct denode), 0, 0, 0,
 	    "msdosnopl", &pool_allocator_nointr, IPL_NONE);
 	dehashtbl = hashinit(desiredvnodes / 2, HASH_LIST, true, &dehash);
 	mutex_init(&msdosfs_ihash_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&msdosfs_hashlock, MUTEX_DEFAULT, IPL_NONE);
+}
 /*
  * Reinitialize inode hash table.
  */
 void
-msdosfs_reinit()
+msdosfs_reinit(void)
+{
 	struct denode *dep;
 	struct ihashhead *oldhash, *hash;
 	u_long oldmask, mask, val;
 	int i;
 	hash = hashinit(desiredvnodes / 2, HASH_LIST, true, &mask);
 	mutex_enter(&msdosfs_ihash_lock);
 	oldhash = dehashtbl;
 	oldmask = dehash;
 	dehashtbl = hash;
 	dehash = mask;
 	for (i = 0; i <= oldmask; i++) {
 		while ((dep = LIST_FIRST(&oldhash[i])) != NULL) {
 			LIST_REMOVE(dep, de_hash);
 			val = DEHASH(dep->de_dev, dep->de_dirclust,
 			    dep->de_diroffset);
 			LIST_INSERT_HEAD(&hash[val], dep, de_hash);
+		}
+	}
 	mutex_exit(&msdosfs_ihash_lock);
 	hashdone(oldhash, HASH_LIST, oldmask);
+}
 void
-msdosfs_done()
+msdosfs_done(void)
+{
 	hashdone(dehashtbl, HASH_LIST, dehash);
 	pool_destroy(&msdosfs_denode_pool);
 	mutex_destroy(&msdosfs_ihash_lock);
 	mutex_destroy(&msdosfs_hashlock);
 	malloc_type_detach(M_MSDOSFSTMP);
 	malloc_type_detach(M_MSDOSFSFAT);
 	malloc_type_detach(M_MSDOSFSMNT);
+}
 static struct denode *
 msdosfs_hashget(dev_t dev, u_long dirclust, u_long diroff, int flags)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msdosfs_vfsops.c,v 1.72 2009/03/14 15:36:21 dsl Exp $	*/
+/*	$NetBSD: msdosfs_vfsops.c,v 1.73 2009/03/15 17:15:57 cegger Exp $	*/
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -38,27 +38,27 @@
  * it, and don't remove this notice.
+ *
  * This software is provided "as is".
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
+ *
  * October 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.72 2009/03/14 15:36:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.73 2009/03/15 17:15:57 cegger Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <miscfs/genfs/genfs.h>
 @@ -222,27 +222,27 @@ update_mp(struct mount *mp, struct msdos
 			pmp->pm_flags |= findwin95(VTODE(rtvp))
 				? MSDOSFSMNT_LONGNAME
 					: MSDOSFSMNT_SHORTNAME;
 			vput(rtvp);
+		}
+	}
 	mp->mnt_stat.f_namemax = MSDOSFS_NAMEMAX(pmp);
 	return 0;
+}
 int
-msdosfs_mountroot()
+msdosfs_mountroot(void)
+{
 	struct mount *mp;
 	struct lwp *l = curlwp;	/* XXX */
 	int error;
 	struct msdosfs_args args;
 	if (device_class(root_device) != DV_DISK)
 		return (ENODEV);
 	if ((error = vfs_rootmountalloc(MOUNT_MSDOS, "root_device", &mp))) {
 		vrele(rootvp);
 		return (error);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntfs_ihash.c,v 1.8 2009/03/14 15:36:22 dsl Exp $	*/
+/*	$NetBSD: ntfs_ihash.c,v 1.9 2009/03/15 17:15:58 cegger Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,66 +23,66 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
  * Id: ntfs_ihash.c,v 1.5 1999/05/12 09:42:58 semenu Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_ihash.c,v 1.8 2009/03/14 15:36:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_ihash.c,v 1.9 2009/03/15 17:15:58 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <fs/ntfs/ntfs.h>
 #include <fs/ntfs/ntfs_inode.h>
 #include <fs/ntfs/ntfs_ihash.h>
 /*
  * Structures associated with inode cacheing.
  */
 static LIST_HEAD(nthashhead, ntnode) *ntfs_nthashtbl;
 static u_long	ntfs_nthash;		/* size of hash table - 1 */
 #define	NTNOHASH(device, inum)	((minor(device) + (inum)) & ntfs_nthash)
 static kmutex_t ntfs_nthash_lock;
 kmutex_t ntfs_hashlock;
 /*
  * Initialize inode hash table.
  */
 void
-ntfs_nthashinit()
+ntfs_nthashinit(void)
+{
 	mutex_init(&ntfs_hashlock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&ntfs_nthash_lock, MUTEX_DEFAULT, IPL_NONE);
 	ntfs_nthashtbl = hashinit(desiredvnodes, HASH_LIST, true, &ntfs_nthash);
+}
 /*
  * Reinitialize inode hash table.
  */
 void
-ntfs_nthashreinit()
+ntfs_nthashreinit(void)
+{
 	struct ntnode *ip;
 	struct nthashhead *oldhash, *hash;
 	u_long oldmask, mask, val;
 	int i;
 	hash = hashinit(desiredvnodes, HASH_LIST, true, &mask);
 	mutex_enter(&ntfs_nthash_lock);
 	oldhash = ntfs_nthashtbl;
 	oldmask = ntfs_nthash;
 	ntfs_nthashtbl = hash;
 	ntfs_nthash = mask;
 @@ -92,27 +92,27 @@ ntfs_nthashreinit()
 			val = NTNOHASH(ip->i_dev, ip->i_number);
 			LIST_INSERT_HEAD(&hash[val], ip, i_hash);
+		}
+	}
 	mutex_exit(&ntfs_nthash_lock);
 	hashdone(oldhash, HASH_LIST, oldmask);
+}
 /*
  * Free the inode hash table. Called from ntfs_done(), only needed
  * on NetBSD.
  */
 void
-ntfs_nthashdone()
+ntfs_nthashdone(void)
+{
 	hashdone(ntfs_nthashtbl, HASH_LIST, ntfs_nthash);
 	mutex_destroy(&ntfs_hashlock);
 	mutex_destroy(&ntfs_nthash_lock);
+}
 /*
  * Use the device/inum pair to find the incore inode, and return a pointer
  * to it. If it is in core, return it, even if it is locked.
  */
 struct ntnode *
 ntfs_nthashlookup(dev_t dev, ino_t inum)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntfs_subr.c,v 1.40 2009/03/14 21:04:24 dsl Exp $	*/
+/*	$NetBSD: ntfs_subr.c,v 1.41 2009/03/15 17:15:58 cegger Exp $	*/
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko (semenu@FreeBSD.org)
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	Id: ntfs_subr.c,v 1.4 1999/05/12 09:43:01 semenu Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.40 2009/03/14 21:04:24 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.41 2009/03/15 17:15:58 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/kauth.h>
 @@ -2001,27 +2001,27 @@ ntfs_runtocn(
 			return (error);
+		}
 	} while (ccl <= vcn);
 	*cn = ccn + vcn;
 	return (0);
+}
 #endif
 /*
  * this initializes toupper table & dependant variables to be ready for
  * later work
  */
 void
-ntfs_toupper_init()
+ntfs_toupper_init(void)
+{
 	ntfs_toupper_tab = (wchar *) NULL;
 	mutex_init(&ntfs_toupper_lock, MUTEX_DEFAULT, IPL_NONE);
 	ntfs_toupper_usecount = 0;
+}
 /*
  * if the ntfs_toupper_tab[] is filled already, just raise use count;
  * otherwise read the data from the filesystem we are currently mounting
  */
 int
 ntfs_toupper_use(struct mount *mp, struct ntfsmount *ntmp)
+{
 @@ -2052,27 +2052,27 @@ ntfs_toupper_use(struct mount *mp, struc
 	vput(vp);
     out:
 	ntfs_toupper_usecount++;
 	mutex_exit(&ntfs_toupper_lock);
 	return (error);
+}
 /*
  * lower the use count and if it reaches zero, free the memory
  * tied by toupper table
  */
 void
-ntfs_toupper_unuse()
+ntfs_toupper_unuse(void)
+{
 	/* get exclusive access */
 	mutex_enter(&ntfs_toupper_lock);
 	ntfs_toupper_usecount--;
 	if (ntfs_toupper_usecount == 0) {
 		free(ntfs_toupper_tab, M_NTFSRDATA);
 		ntfs_toupper_tab = NULL;
+	}
 #ifdef DIAGNOSTIC
 	else if (ntfs_toupper_usecount < 0) {
 		panic("ntfs_toupper_unuse(): use count negative: %d",
 			ntfs_toupper_usecount);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ntfs_vfsops.c,v 1.75 2009/03/14 15:36:22 dsl Exp $	*/
+/*	$NetBSD: ntfs_vfsops.c,v 1.76 2009/03/15 17:15:58 cegger Exp $	*/
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	Id: ntfs_vfsops.c,v 1.7 1999/05/31 11:28:30 phk Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.75 2009/03/14 15:36:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.76 2009/03/15 17:15:58 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/device.h>
 @@ -82,27 +82,27 @@ static void     ntfs_init(void);
 static void     ntfs_reinit(void);
 static void     ntfs_done(void);
 static int      ntfs_fhtovp(struct mount *, struct fid *,
 				struct vnode **);
 static int      ntfs_mountroot(void);
 static const struct genfs_ops ntfs_genfsops = {
 	.gop_write = genfs_compat_gop_write,
 };
 static struct sysctllog *ntfs_sysctl_log;
 static int
-ntfs_mountroot()
+ntfs_mountroot(void)
+{
 	struct mount *mp;
 	struct lwp *l = curlwp;	/* XXX */
 	int error;
 	struct ntfs_args args;
 	if (device_class(root_device) != DV_DISK)
 		return (ENODEV);
 	if ((error = vfs_rootmountalloc(MOUNT_NTFS, "root_device", &mp))) {
 		vrele(rootvp);
 		return (error);
+	}
 @@ -117,49 +117,49 @@ ntfs_mountroot()
 		vfs_destroy(mp);
 		return (error);
+	}
 	mutex_enter(&mountlist_lock);
 	CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
 	mutex_exit(&mountlist_lock);
 	(void)ntfs_statvfs(mp, &mp->mnt_stat);
 	vfs_unbusy(mp, false, NULL);
 	return (0);
+}
 static void
-ntfs_init()
+ntfs_init(void)
+{
 	malloc_type_attach(M_NTFSMNT);
 	malloc_type_attach(M_NTFSNTNODE);
 	malloc_type_attach(M_NTFSFNODE);
 	malloc_type_attach(M_NTFSDIR);
 	malloc_type_attach(M_NTFSNTVATTR);
 	malloc_type_attach(M_NTFSRDATA);
 	malloc_type_attach(M_NTFSDECOMP);
 	malloc_type_attach(M_NTFSRUN);
 	ntfs_nthashinit();
 	ntfs_toupper_init();
+}
 static void
-ntfs_reinit()
+ntfs_reinit(void)
+{
 	ntfs_nthashreinit();
+}
 static void
-ntfs_done()
+ntfs_done(void)
+{
 	ntfs_nthashdone();
 	malloc_type_detach(M_NTFSMNT);
 	malloc_type_detach(M_NTFSNTNODE);
 	malloc_type_detach(M_NTFSFNODE);
 	malloc_type_detach(M_NTFSDIR);
 	malloc_type_detach(M_NTFSNTVATTR);
 	malloc_type_detach(M_NTFSRDATA);
 	malloc_type_detach(M_NTFSDECOMP);
 	malloc_type_detach(M_NTFSRUN);
+}
 static int