Remove __P.

37 files changed, 417 insertions, 423 deletions

diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index 9911453..7428235 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -42,20 +42,20 @@
 #include <sys/poll.h>
 #include <sys/vnode.h>
 
-static int	chkvnlock __P((struct vnode *));
+static int	chkvnlock(struct vnode *);
 /*
  * Prototypes for dead operations on vnodes.
  */
-static int	dead_badop __P((void));
-static int	dead_bmap __P((struct vop_bmap_args *));
-static int	dead_ioctl __P((struct vop_ioctl_args *));
-static int	dead_lock __P((struct vop_lock_args *));
-static int	dead_lookup __P((struct vop_lookup_args *));
-static int	dead_open __P((struct vop_open_args *));
-static int	dead_poll __P((struct vop_poll_args *));
-static int	dead_print __P((struct vop_print_args *));
-static int	dead_read __P((struct vop_read_args *));
-static int	dead_write __P((struct vop_write_args *));
+static int	dead_badop(void);
+static int	dead_bmap(struct vop_bmap_args *);
+static int	dead_ioctl(struct vop_ioctl_args *);
+static int	dead_lock(struct vop_lock_args *);
+static int	dead_lookup(struct vop_lookup_args *);
+static int	dead_open(struct vop_open_args *);
+static int	dead_poll(struct vop_poll_args *);
+static int	dead_print(struct vop_print_args *);
+static int	dead_read(struct vop_read_args *);
+static int	dead_write(struct vop_write_args *);
 
 vop_t **dead_vnodeop_p;
 static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 34d7666..55c5d3d 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -50,13 +50,13 @@
 
 MALLOC_DEFINE(M_DEVFS, "DEVFS", "DEVFS data");
 
-static int	devfs_mount __P((struct mount *mp, char *path, caddr_t data,
-				  struct nameidata *ndp, struct thread *td));
-static int	devfs_unmount __P((struct mount *mp, int mntflags,
-				  struct thread *td));
-static int	devfs_root __P((struct mount *mp, struct vnode **vpp));
-static int	devfs_statfs __P((struct mount *mp, struct statfs *sbp,
-				   struct thread *td));
+static int	devfs_mount(struct mount *mp, char *path, caddr_t data,
+				  struct nameidata *ndp, struct thread *td);
+static int	devfs_unmount(struct mount *mp, int mntflags,
+				  struct thread *td);
+static int	devfs_root(struct mount *mp, struct vnode **vpp);
+static int	devfs_statfs(struct mount *mp, struct statfs *sbp,
+				   struct thread *td);
 
 /*
  * Mount the filesystem
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index aac1151..7310001 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -60,20 +60,20 @@
 
 #include <fs/devfs/devfs.h>
 
-static int	devfs_access __P((struct vop_access_args *ap));
-static int	devfs_getattr __P((struct vop_getattr_args *ap));
-static int	devfs_lookupx __P((struct vop_lookup_args *ap));
-static int	devfs_mknod __P((struct vop_mknod_args *ap));
-static int	devfs_pathconf __P((struct vop_pathconf_args *ap));
-static int	devfs_print __P((struct vop_print_args *ap));
-static int	devfs_read __P((struct vop_read_args *ap));
-static int	devfs_readdir __P((struct vop_readdir_args *ap));
-static int	devfs_readlink __P((struct vop_readlink_args *ap));
-static int	devfs_reclaim __P((struct vop_reclaim_args *ap));
-static int	devfs_remove __P((struct vop_remove_args *ap));
-static int	devfs_revoke __P((struct vop_revoke_args *ap));
-static int	devfs_setattr __P((struct vop_setattr_args *ap));
-static int	devfs_symlink __P((struct vop_symlink_args *ap));
+static int	devfs_access(struct vop_access_args *ap);
+static int	devfs_getattr(struct vop_getattr_args *ap);
+static int	devfs_lookupx(struct vop_lookup_args *ap);
+static int	devfs_mknod(struct vop_mknod_args *ap);
+static int	devfs_pathconf(struct vop_pathconf_args *ap);
+static int	devfs_print(struct vop_print_args *ap);
+static int	devfs_read(struct vop_read_args *ap);
+static int	devfs_readdir(struct vop_readdir_args *ap);
+static int	devfs_readlink(struct vop_readlink_args *ap);
+static int	devfs_reclaim(struct vop_reclaim_args *ap);
+static int	devfs_remove(struct vop_remove_args *ap);
+static int	devfs_revoke(struct vop_revoke_args *ap);
+static int	devfs_setattr(struct vop_setattr_args *ap);
+static int	devfs_symlink(struct vop_symlink_args *ap);
 
 /*
  * Construct the fully qualified path name relative to the mountpoint
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index f90ea8d..b7dc490 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -62,8 +62,8 @@ struct fdescnode {
 #define VFSTOFDESC(mp)	((struct fdescmount *)((mp)->mnt_data))
 #define	VTOFDESC(vp) ((struct fdescnode *)(vp)->v_data)
 
-extern int fdesc_init __P((struct vfsconf *));
-extern int fdesc_root __P((struct mount *, struct vnode **));
-extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **,
-			      struct thread *));
+extern int fdesc_init(struct vfsconf *);
+extern int fdesc_root(struct mount *, struct vnode **);
+extern int fdesc_allocvp(fdntype, int, struct mount *, struct vnode **,
+			      struct thread *);
 #endif /* _KERNEL */
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 329eab9..de4fa4d 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -58,12 +58,12 @@
 
 static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure");
 
-static int	fdesc_mount __P((struct mount *mp, char *path, caddr_t data,
-				 struct nameidata *ndp, struct thread *td));
-static int	fdesc_unmount __P((struct mount *mp, int mntflags,
-				   struct thread *td));
-static int	fdesc_statfs __P((struct mount *mp, struct statfs *sbp,
-				  struct thread *td));
+static int	fdesc_mount(struct mount *mp, char *path, caddr_t data,
+				 struct nameidata *ndp, struct thread *td);
+static int	fdesc_unmount(struct mount *mp, int mntflags,
+				   struct thread *td);
+static int	fdesc_statfs(struct mount *mp, struct statfs *sbp,
+				  struct thread *td);
   
 /*
  * Mount the per-process file descriptors (/dev/fd)
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index d3b6bda..62852e8 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -72,15 +72,15 @@ static vop_t **fdesc_vnodeop_p;
 static LIST_HEAD(fdhashhead, fdescnode) *fdhashtbl;
 static u_long fdhash;
 
-static int	fdesc_getattr __P((struct vop_getattr_args *ap));
-static int	fdesc_inactive __P((struct vop_inactive_args *ap));
-static int	fdesc_lookup __P((struct vop_lookup_args *ap));
-static int	fdesc_open __P((struct vop_open_args *ap));
-static int	fdesc_print __P((struct vop_print_args *ap));
-static int	fdesc_readdir __P((struct vop_readdir_args *ap));
-static int	fdesc_reclaim __P((struct vop_reclaim_args *ap));
-static int	fdesc_poll __P((struct vop_poll_args *ap));
-static int	fdesc_setattr __P((struct vop_setattr_args *ap));
+static int	fdesc_getattr(struct vop_getattr_args *ap);
+static int	fdesc_inactive(struct vop_inactive_args *ap);
+static int	fdesc_lookup(struct vop_lookup_args *ap);
+static int	fdesc_open(struct vop_open_args *ap);
+static int	fdesc_print(struct vop_print_args *ap);
+static int	fdesc_readdir(struct vop_readdir_args *ap);
+static int	fdesc_reclaim(struct vop_reclaim_args *ap);
+static int	fdesc_poll(struct vop_poll_args *ap);
+static int	fdesc_setattr(struct vop_setattr_args *ap);
 
 /*
  * Initialise cache headers
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index e630207..e1fbe9b 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -39,6 +39,6 @@ extern vop_t **fifo_vnodeop_p;
 /*
  * Prototypes for fifo operations on vnodes.
  */
-int	fifo_vnoperate __P((struct vop_generic_args *));
-int	fifo_printinfo __P((struct vnode *));
+int	fifo_vnoperate(struct vop_generic_args *);
+int	fifo_printinfo(struct vnode *);
 
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 8153670..c47f822 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -64,18 +64,18 @@ struct fifoinfo {
 	long		fi_writers;
 };
 
-static int	fifo_badop __P((void));
-static int	fifo_print __P((struct vop_print_args *));
-static int	fifo_lookup __P((struct vop_lookup_args *));
-static int	fifo_open __P((struct vop_open_args *));
-static int	fifo_close __P((struct vop_close_args *));
-static int	fifo_read __P((struct vop_read_args *));
-static int	fifo_write __P((struct vop_write_args *));
-static int	fifo_ioctl __P((struct vop_ioctl_args *));
-static int	fifo_poll __P((struct vop_poll_args *));
-static int	fifo_kqfilter __P((struct vop_kqfilter_args *));
-static int	fifo_pathconf __P((struct vop_pathconf_args *));
-static int	fifo_advlock __P((struct vop_advlock_args *));
+static int	fifo_badop(void);
+static int	fifo_print(struct vop_print_args *);
+static int	fifo_lookup(struct vop_lookup_args *);
+static int	fifo_open(struct vop_open_args *);
+static int	fifo_close(struct vop_close_args *);
+static int	fifo_read(struct vop_read_args *);
+static int	fifo_write(struct vop_write_args *);
+static int	fifo_ioctl(struct vop_ioctl_args *);
+static int	fifo_poll(struct vop_poll_args *);
+static int	fifo_kqfilter(struct vop_kqfilter_args *);
+static int	fifo_pathconf(struct vop_pathconf_args *);
+static int	fifo_advlock(struct vop_advlock_args *);
 
 static void	filt_fifordetach(struct knote *kn);
 static int	filt_fiforead(struct knote *kn, long hint);
diff --git a/sys/fs/hpfs/hpfs.h b/sys/fs/hpfs/hpfs.h
index ec2cfad..9a28562 100644
--- a/sys/fs/hpfs/hpfs.h
+++ b/sys/fs/hpfs/hpfs.h
@@ -389,11 +389,11 @@ MALLOC_DECLARE(M_HPFSNO);
 extern vop_t ** hpfs_vnodeop_p;
 
 /* Hash routines, too small to be separate header */
-void hpfs_hphashinit __P((void));
-void hpfs_hphashdestroy __P((void));
-struct hpfsnode *hpfs_hphashlookup __P((dev_t, lsn_t));
-struct hpfsnode *hpfs_hphashget __P((dev_t, lsn_t));
-int hpfs_hphashvget __P((dev_t, lsn_t, int, struct vnode **, struct thread *));
-void hpfs_hphashins __P((register struct hpfsnode *));
-void hpfs_hphashrem __P((register struct hpfsnode *));
+void hpfs_hphashinit(void);
+void hpfs_hphashdestroy(void);
+struct hpfsnode *hpfs_hphashlookup(dev_t, lsn_t);
+struct hpfsnode *hpfs_hphashget(dev_t, lsn_t);
+int hpfs_hphashvget(dev_t, lsn_t, int, struct vnode **, struct thread *);
+void hpfs_hphashins(register struct hpfsnode *);
+void hpfs_hphashrem(register struct hpfsnode *);
 extern struct lock hpfs_hphash_lock;
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index cf3c114..05ae373 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -55,21 +55,19 @@ MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure");
 
 struct sockaddr;
 
-static int	hpfs_root __P((struct mount *, struct vnode **));
-static int	hpfs_statfs __P((struct mount *, struct statfs *,
-				 struct thread *));
-static int	hpfs_unmount __P((struct mount *, int, struct thread *));
-static int	hpfs_vget __P((struct mount *mp, ino_t ino, int flags,
-			       struct vnode **vpp));
-static int	hpfs_mountfs __P((register struct vnode *, struct mount *, 
-				  struct hpfs_args *, struct thread *));
-static int	hpfs_vptofh __P((struct vnode *, struct fid *));
-static int	hpfs_fhtovp __P((struct mount *, struct fid *,
-				 struct vnode **));
-static int	hpfs_mount __P((struct mount *, char *, caddr_t,
-				struct nameidata *, struct thread *));
-static int	hpfs_init __P((struct vfsconf *));
-static int	hpfs_uninit __P((struct vfsconf *));
+static int	hpfs_root(struct mount *, struct vnode **);
+static int	hpfs_statfs(struct mount *, struct statfs *, struct thread *);
+static int	hpfs_unmount(struct mount *, int, struct thread *);
+static int	hpfs_vget(struct mount *mp, ino_t ino, int flags,
+			       struct vnode **vpp);
+static int	hpfs_mountfs(register struct vnode *, struct mount *, 
+				  struct hpfs_args *, struct thread *);
+static int	hpfs_vptofh(struct vnode *, struct fid *);
+static int	hpfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int	hpfs_mount(struct mount *, char *, caddr_t,
+				struct nameidata *, struct thread *);
+static int	hpfs_init(struct vfsconf *);
+static int	hpfs_uninit(struct vfsconf *);
 
 static int
 hpfs_init (
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 7b4d731..af836cb 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -57,27 +57,27 @@
 #include <fs/hpfs/hpfs_subr.h>
 #include <fs/hpfs/hpfs_ioctl.h>
 
-static int	hpfs_de_uiomove __P((struct hpfsmount *, struct hpfsdirent *,
-				     struct uio *));
-static int	hpfs_ioctl __P((struct vop_ioctl_args *ap));
-static int	hpfs_read __P((struct vop_read_args *));
-static int	hpfs_write __P((struct vop_write_args *ap));
-static int	hpfs_getattr __P((struct vop_getattr_args *ap));
-static int	hpfs_setattr __P((struct vop_setattr_args *ap));
-static int	hpfs_inactive __P((struct vop_inactive_args *ap));
-static int	hpfs_print __P((struct vop_print_args *ap));
-static int	hpfs_reclaim __P((struct vop_reclaim_args *ap));
-static int	hpfs_strategy __P((struct vop_strategy_args *ap));
-static int	hpfs_access __P((struct vop_access_args *ap));
-static int	hpfs_open __P((struct vop_open_args *ap));
-static int	hpfs_close __P((struct vop_close_args *ap));
-static int	hpfs_readdir __P((struct vop_readdir_args *ap));
-static int	hpfs_lookup __P((struct vop_lookup_args *ap));
-static int	hpfs_create __P((struct vop_create_args *));
-static int	hpfs_remove __P((struct vop_remove_args *));
-static int	hpfs_bmap __P((struct vop_bmap_args *ap));
-static int	hpfs_fsync __P((struct vop_fsync_args *ap));
-static int	hpfs_pathconf __P((struct vop_pathconf_args *ap));
+static int	hpfs_de_uiomove(struct hpfsmount *, struct hpfsdirent *,
+				     struct uio *);
+static int	hpfs_ioctl(struct vop_ioctl_args *ap);
+static int	hpfs_read(struct vop_read_args *);
+static int	hpfs_write(struct vop_write_args *ap);
+static int	hpfs_getattr(struct vop_getattr_args *ap);
+static int	hpfs_setattr(struct vop_setattr_args *ap);
+static int	hpfs_inactive(struct vop_inactive_args *ap);
+static int	hpfs_print(struct vop_print_args *ap);
+static int	hpfs_reclaim(struct vop_reclaim_args *ap);
+static int	hpfs_strategy(struct vop_strategy_args *ap);
+static int	hpfs_access(struct vop_access_args *ap);
+static int	hpfs_open(struct vop_open_args *ap);
+static int	hpfs_close(struct vop_close_args *ap);
+static int	hpfs_readdir(struct vop_readdir_args *ap);
+static int	hpfs_lookup(struct vop_lookup_args *ap);
+static int	hpfs_create(struct vop_create_args *);
+static int	hpfs_remove(struct vop_remove_args *);
+static int	hpfs_bmap(struct vop_bmap_args *ap);
+static int	hpfs_fsync(struct vop_fsync_args *ap);
+static int	hpfs_pathconf(struct vop_pathconf_args *ap);
 
 static int
 hpfs_fsync(ap)
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index 6083de6..f491a43 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -260,26 +260,26 @@ struct defid {
 
 extern vop_t **msdosfs_vnodeop_p;
 
-int msdosfs_lookup __P((struct vop_cachedlookup_args *));
-int msdosfs_inactive __P((struct vop_inactive_args *));
-int msdosfs_reclaim __P((struct vop_reclaim_args *));
+int msdosfs_lookup(struct vop_cachedlookup_args *);
+int msdosfs_inactive(struct vop_inactive_args *);
+int msdosfs_reclaim(struct vop_reclaim_args *);
 
 /*
  * Internal service routine prototypes.
  */
-int deget __P((struct msdosfsmount *, u_long, u_long, struct denode **));
-int uniqdosname __P((struct denode *, struct componentname *, u_char *));
-int findwin95 __P((struct denode *));
+int deget(struct msdosfsmount *, u_long, u_long, struct denode **);
+int uniqdosname(struct denode *, struct componentname *, u_char *);
+int findwin95(struct denode *);
 
-int readep __P((struct msdosfsmount *pmp, u_long dirclu, u_long dirofs,  struct buf **bpp, struct direntry **epp));
-int readde __P((struct denode *dep, struct buf **bpp, struct direntry **epp));
-int deextend __P((struct denode *dep, u_long length, struct ucred *cred));
-int fillinusemap __P((struct msdosfsmount *pmp));
-void reinsert __P((struct denode *dep));
-int dosdirempty __P((struct denode *dep));
-int createde __P((struct denode *dep, struct denode *ddep, struct denode **depp, struct componentname *cnp));
-int deupdat __P((struct denode *dep, int waitfor));
-int removede __P((struct denode *pdep, struct denode *dep));
-int detrunc __P((struct denode *dep, u_long length, int flags, struct ucred *cred, struct thread *td));
-int doscheckpath __P(( struct denode *source, struct denode *target));
+int readep(struct msdosfsmount *pmp, u_long dirclu, u_long dirofs,  struct buf **bpp, struct direntry **epp);
+int readde(struct denode *dep, struct buf **bpp, struct direntry **epp);
+int deextend(struct denode *dep, u_long length, struct ucred *cred);
+int fillinusemap(struct msdosfsmount *pmp);
+void reinsert(struct denode *dep);
+int dosdirempty(struct denode *dep);
+int createde(struct denode *dep, struct denode *ddep, struct denode **depp, struct componentname *cnp);
+int deupdat(struct denode *dep, int waitfor);
+int removede(struct denode *pdep, struct denode *dep);
+int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred, struct thread *td);
+int doscheckpath( struct denode *source, struct denode *target);
 #endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index fccf58b..8ed5335 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -129,15 +129,15 @@ struct winentry {
 
 #ifdef _KERNEL
 struct dirent;
-void unix2dostime __P((struct timespec *tsp, u_int16_t *ddp, 
-	     u_int16_t *dtp, u_int8_t *dhp));
-void dos2unixtime __P((u_int dd, u_int dt, u_int dh, struct timespec *tsp));
-int dos2unixfn __P((u_char dn[11], u_char *un, int lower, int d2u_loaded, u_int8_t *d2u, int ul_loaded, u_int8_t *ul));
-int unix2dosfn __P((const u_char *un, u_char dn[12], int unlen, u_int gen, int u2d_loaded, u_int8_t *u2d, int lu_loaded, u_int8_t *lu));
-int unix2winfn __P((const u_char *un, int unlen, struct winentry *wep, int cnt, int chksum, int table_loaded, u_int16_t *u2w));
-int winChkName __P((const u_char *un, int unlen, struct winentry *wep, int chksum, int u2w_loaded, u_int16_t *u2w, int ul_loaded, u_int8_t *ul));
-int win2unixfn __P((struct winentry *wep, struct dirent *dp, int chksum, int table_loaded, u_int16_t *u2w));
-u_int8_t winChksum __P((u_int8_t *name));
-int winSlotCnt __P((const u_char *un, int unlen));
-int winLenFixup __P((const u_char *un, int unlen));
+void unix2dostime(struct timespec *tsp, u_int16_t *ddp, 
+	     u_int16_t *dtp, u_int8_t *dhp);
+void dos2unixtime(u_int dd, u_int dt, u_int dh, struct timespec *tsp);
+int dos2unixfn(u_char dn[11], u_char *un, int lower, int d2u_loaded, u_int8_t *d2u, int ul_loaded, u_int8_t *ul);
+int unix2dosfn(const u_char *un, u_char dn[12], int unlen, u_int gen, int u2d_loaded, u_int8_t *u2d, int lu_loaded, u_int8_t *lu);
+int unix2winfn(const u_char *un, int unlen, struct winentry *wep, int cnt, int chksum, int table_loaded, u_int16_t *u2w);
+int winChkName(const u_char *un, int unlen, struct winentry *wep, int chksum, int u2w_loaded, u_int16_t *u2w, int ul_loaded, u_int8_t *ul);
+int win2unixfn(struct winentry *wep, struct dirent *dp, int chksum, int table_loaded, u_int16_t *u2w);
+u_int8_t winChksum(u_int8_t *name);
+int winSlotCnt(const u_char *un, int unlen);
+int winLenFixup(const u_char *un, int unlen);
 #endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index 9a10c68..216fde5 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -92,12 +92,12 @@
  */
 #define	DE_CLEAR	1	/* Zero out the blocks allocated */
 
-int pcbmap __P((struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int* sp));
-int clusterfree __P((struct msdosfsmount *pmp, u_long cn, u_long *oldcnp));
-int clusteralloc __P((struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got));
-int fatentry __P((int function, struct msdosfsmount *pmp, u_long cluster, u_long *oldcontents, u_long newcontents));
-int freeclusterchain __P((struct msdosfsmount *pmp, u_long startchain));
-int extendfile __P((struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags));
-void fc_purge __P((struct denode *dep, u_int frcn));
+int pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int* sp);
+int clusterfree(struct msdosfsmount *pmp, u_long cn, u_long *oldcnp);
+int clusteralloc(struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got);
+int fatentry(int function, struct msdosfsmount *pmp, u_long cluster, u_long *oldcontents, u_long newcontents);
+int freeclusterchain(struct msdosfsmount *pmp, u_long startchain);
+int extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags);
+void fc_purge(struct denode *dep, u_int frcn);
 
 #endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 1cfe6a4..32138c5 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -88,7 +88,7 @@ static u_long  lastday;
 static u_short lastddate;
 static u_short lastdtime;
 
-static __inline u_int8_t find_lcode __P((u_int16_t code, u_int16_t *u2w));
+static __inline u_int8_t find_lcode(u_int16_t code, u_int16_t *u2w);
 
 /*
  * Convert the unix version of time to dos's idea of time to be used in
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 9538ba3..3a24b7c 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -93,10 +93,9 @@ union _qcvt {
 }
 
 static struct denode *
-		msdosfs_hashget __P((dev_t dev, u_long dirclust,
-				     u_long diroff));
-static void	msdosfs_hashins __P((struct denode *dep));
-static void	msdosfs_hashrem __P((struct denode *dep));
+		msdosfs_hashget(dev_t dev, u_long dirclust, u_long diroff);
+static void	msdosfs_hashins(struct denode *dep);
+static void	msdosfs_hashrem(struct denode *dep);
 
 /*ARGSUSED*/
 int 
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 7c4f6c9..a71ec73 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -80,23 +80,23 @@ static int fc_lmdistance[LMMAX];/* counters for how far off the last
 				 * cluster mapped entry was. */
 static int fc_largedistance;	/* off by more than LMMAX		 */
 
-static int	chainalloc __P((struct msdosfsmount *pmp, u_long start,
+static int	chainalloc(struct msdosfsmount *pmp, u_long start,
 				u_long count, u_long fillwith,
-				u_long *retcluster, u_long *got));
-static int	chainlength __P((struct msdosfsmount *pmp, u_long start,
-				 u_long count));
-static void	fatblock __P((struct msdosfsmount *pmp, u_long ofs,
-			      u_long *bnp, u_long *sizep, u_long *bop));
-static int	fatchain __P((struct msdosfsmount *pmp, u_long start,
-			      u_long count, u_long fillwith));
-static void	fc_lookup __P((struct denode *dep, u_long findcn,
-			       u_long *frcnp, u_long *fsrcnp));
-static void	updatefats __P((struct msdosfsmount *pmp, struct buf *bp,
-				u_long fatbn));
+				u_long *retcluster, u_long *got);
+static int	chainlength(struct msdosfsmount *pmp, u_long start,
+				 u_long count);
+static void	fatblock(struct msdosfsmount *pmp, u_long ofs,
+			      u_long *bnp, u_long *sizep, u_long *bop);
+static int	fatchain(struct msdosfsmount *pmp, u_long start,
+			      u_long count, u_long fillwith);
+static void	fc_lookup(struct denode *dep, u_long findcn,
+			       u_long *frcnp, u_long *fsrcnp);
+static void	updatefats(struct msdosfsmount *pmp, struct buf *bp,
+				u_long fatbn);
 static __inline void
-		usemap_alloc __P((struct msdosfsmount *pmp, u_long cn));
+		usemap_alloc(struct msdosfsmount *pmp, u_long cn);
 static __inline void
-		usemap_free __P((struct msdosfsmount *pmp, u_long cn));
+		usemap_free(struct msdosfsmount *pmp, u_long cn);
 
 static void
 fatblock(pmp, ofs, bnp, sizep, bop)
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 622d7d0..88cc67c 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -86,20 +86,19 @@
 MALLOC_DEFINE(M_MSDOSFSMNT, "MSDOSFS mount", "MSDOSFS mount structure");
 static MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table");
 
-static int	update_mp __P((struct mount *mp, struct msdosfs_args *argp));
-static int	mountmsdosfs __P((struct vnode *devvp, struct mount *mp,
-				  struct thread *td, struct msdosfs_args *argp));
-static int	msdosfs_fhtovp __P((struct mount *, struct fid *,
-				    struct vnode **));
-static int	msdosfs_mount __P((struct mount *, char *, caddr_t,
-				   struct nameidata *, struct thread *));
-static int	msdosfs_root __P((struct mount *, struct vnode **));
-static int	msdosfs_statfs __P((struct mount *, struct statfs *,
-				    struct thread *));
-static int	msdosfs_sync __P((struct mount *, int, struct ucred *,
-				  struct thread *));
-static int	msdosfs_unmount __P((struct mount *, int, struct thread *));
-static int	msdosfs_vptofh __P((struct vnode *, struct fid *));
+static int	update_mp(struct mount *mp, struct msdosfs_args *argp);
+static int	mountmsdosfs(struct vnode *devvp, struct mount *mp,
+				  struct thread *td, struct msdosfs_args *argp);
+static int	msdosfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int	msdosfs_mount(struct mount *, char *, caddr_t,
+				   struct nameidata *, struct thread *);
+static int	msdosfs_root(struct mount *, struct vnode **);
+static int	msdosfs_statfs(struct mount *, struct statfs *,
+				    struct thread *);
+static int	msdosfs_sync(struct mount *, int, struct ucred *,
+				  struct thread *);
+static int	msdosfs_unmount(struct mount *, int, struct thread *);
+static int	msdosfs_vptofh(struct vnode *, struct fid *);
 
 static int
 update_mp(mp, argp)
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 51e541f..5118409 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -81,26 +81,26 @@
 /*
  * Prototypes for MSDOSFS vnode operations
  */
-static int msdosfs_create __P((struct vop_create_args *));
-static int msdosfs_mknod __P((struct vop_mknod_args *));
-static int msdosfs_close __P((struct vop_close_args *));
-static int msdosfs_access __P((struct vop_access_args *));
-static int msdosfs_getattr __P((struct vop_getattr_args *));
-static int msdosfs_setattr __P((struct vop_setattr_args *));
-static int msdosfs_read __P((struct vop_read_args *));
-static int msdosfs_write __P((struct vop_write_args *));
-static int msdosfs_fsync __P((struct vop_fsync_args *));
-static int msdosfs_remove __P((struct vop_remove_args *));
-static int msdosfs_link __P((struct vop_link_args *));
-static int msdosfs_rename __P((struct vop_rename_args *));
-static int msdosfs_mkdir __P((struct vop_mkdir_args *));
-static int msdosfs_rmdir __P((struct vop_rmdir_args *));
-static int msdosfs_symlink __P((struct vop_symlink_args *));
-static int msdosfs_readdir __P((struct vop_readdir_args *));
-static int msdosfs_bmap __P((struct vop_bmap_args *));
-static int msdosfs_strategy __P((struct vop_strategy_args *));
-static int msdosfs_print __P((struct vop_print_args *));
-static int msdosfs_pathconf __P((struct vop_pathconf_args *ap));
+static int msdosfs_create(struct vop_create_args *);
+static int msdosfs_mknod(struct vop_mknod_args *);
+static int msdosfs_close(struct vop_close_args *);
+static int msdosfs_access(struct vop_access_args *);
+static int msdosfs_getattr(struct vop_getattr_args *);
+static int msdosfs_setattr(struct vop_setattr_args *);
+static int msdosfs_read(struct vop_read_args *);
+static int msdosfs_write(struct vop_write_args *);
+static int msdosfs_fsync(struct vop_fsync_args *);
+static int msdosfs_remove(struct vop_remove_args *);
+static int msdosfs_link(struct vop_link_args *);
+static int msdosfs_rename(struct vop_rename_args *);
+static int msdosfs_mkdir(struct vop_mkdir_args *);
+static int msdosfs_rmdir(struct vop_rmdir_args *);
+static int msdosfs_symlink(struct vop_symlink_args *);
+static int msdosfs_readdir(struct vop_readdir_args *);
+static int msdosfs_bmap(struct vop_bmap_args *);
+static int msdosfs_strategy(struct vop_strategy_args *);
+static int msdosfs_print(struct vop_print_args *);
+static int msdosfs_pathconf(struct vop_pathconf_args *ap);
 
 /*
  * Some general notes:
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 1b98219..8099dee 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -196,9 +196,9 @@ struct msdosfsmount {
 #define	fsi_size(pmp) \
 	(1024 << ((pmp)->pm_BlkPerSec >> 2))
 
-int msdosfs_init __P((struct vfsconf *vfsp));
-int msdosfs_uninit __P((struct vfsconf *vfsp));
-int msdosfs_mountroot __P((void));
+int msdosfs_init(struct vfsconf *vfsp);
+int msdosfs_uninit(struct vfsconf *vfsp);
+int msdosfs_mountroot(void);
 
 #endif /* _KERNEL */
 
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index a3f166f..eb3befd 100644
--- a/sys/fs/ntfs/ntfs_ihash.h
+++ b/sys/fs/ntfs/ntfs_ihash.h
@@ -29,9 +29,9 @@
  */
 
 extern struct lock ntfs_hashlock;
-void ntfs_nthashinit __P((void));
-void ntfs_nthashdestroy __P((void));
-struct ntnode   *ntfs_nthashlookup __P((dev_t, ino_t));
-struct ntnode   *ntfs_nthashget __P((dev_t, ino_t));
-void ntfs_nthashins __P((struct ntnode *));
-void ntfs_nthashrem __P((register struct ntnode *));
+void ntfs_nthashinit(void);
+void ntfs_nthashdestroy(void);
+struct ntnode   *ntfs_nthashlookup(dev_t, ino_t);
+struct ntnode   *ntfs_nthashget(dev_t, ino_t);
+void ntfs_nthashins(struct ntnode *);
+void ntfs_nthashrem(register struct ntnode *);
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index de239f0..dd9af4e 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -55,10 +55,10 @@ MALLOC_DEFINE(M_NTFSRDATA, "NTFS res data", "NTFS resident data");
 MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage");
 MALLOC_DEFINE(M_NTFSDECOMP, "NTFS decomp", "NTFS decompression temporary");
 
-static int ntfs_ntlookupattr __P((struct ntfsmount *, const char *, int, int *, char **));
-static int ntfs_findvattr __P((struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t));
-static int ntfs_uastricmp __P((struct ntfsmount *, const wchar *, size_t, const char *, size_t));
-static int ntfs_uastrcmp __P((struct ntfsmount *, const wchar *, size_t, const char *, size_t));
+static int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **);
+static int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t);
+static int ntfs_uastricmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
+static int ntfs_uastrcmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
 
 /* table for mapping Unicode chars into uppercase; it's filled upon first
  * ntfs mount, freed upon last ntfs umount */
diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index 41a2dc7..1d676ab 100644
--- a/sys/fs/ntfs/ntfs_subr.h
+++ b/sys/fs/ntfs/ntfs_subr.h
@@ -74,39 +74,39 @@ struct componentname;
 struct fnode;
 struct uio;
 
-int ntfs_procfixups __P(( struct ntfsmount *, u_int32_t, caddr_t, size_t ));
-int ntfs_parserun __P(( cn_t *, cn_t *, u_int8_t *, u_long, u_long *));
-int ntfs_runtocn __P(( cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t));
-int ntfs_readntvattr_plain __P(( struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *));
-int ntfs_readattr_plain __P(( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *));
-int ntfs_readattr __P(( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *));
-int ntfs_filesize __P(( struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *));
-int ntfs_times __P(( struct ntfsmount *, struct ntnode *, ntfs_times_t *));
-struct timespec	ntfs_nttimetounix __P(( u_int64_t ));
-int ntfs_ntreaddir __P(( struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **));
-int ntfs_runtovrun __P(( cn_t **, cn_t **, u_long *, u_int8_t *));
-int ntfs_attrtontvattr __P(( struct ntfsmount *, struct ntvattr **, struct attr * ));
-void ntfs_freentvattr __P(( struct ntvattr * ));
-int ntfs_loadntvattrs __P(( struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **));
-struct ntvattr * ntfs_findntvattr __P(( struct ntfsmount *, struct ntnode *, u_int32_t, cn_t ));
-int ntfs_ntlookupfile __P((struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **));
-int ntfs_isnamepermitted __P((struct ntfsmount *, struct attr_indexentry * ));
-int ntfs_ntvattrrele __P((struct ntvattr * ));
-int ntfs_ntvattrget __P((struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **));
-int ntfs_ntlookup __P((struct ntfsmount *, ino_t, struct ntnode **));
-int ntfs_ntget __P((struct ntnode *));
-void ntfs_ntref __P((struct ntnode *));
-void ntfs_ntrele __P((struct ntnode *));
-void ntfs_ntput __P((struct ntnode *));
-int ntfs_loadntnode __P(( struct ntfsmount *, struct ntnode * ));
-int ntfs_writentvattr_plain __P((struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *));
-int ntfs_writeattr_plain __P((struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *));
-void ntfs_toupper_init __P((void));
-void ntfs_toupper_destroy __P((void));
-int ntfs_toupper_use __P((struct mount *, struct ntfsmount *));
-void ntfs_toupper_unuse __P((void));
-int ntfs_fget __P((struct ntfsmount *, struct ntnode *, int, char *, struct fnode **));
-void ntfs_frele __P((struct fnode *));
+int ntfs_procfixups( struct ntfsmount *, u_int32_t, caddr_t, size_t );
+int ntfs_parserun( cn_t *, cn_t *, u_int8_t *, u_long, u_long *);
+int ntfs_runtocn( cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t);
+int ntfs_readntvattr_plain( struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *);
+int ntfs_readattr_plain( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *);
+int ntfs_readattr( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *);
+int ntfs_filesize( struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *);
+int ntfs_times( struct ntfsmount *, struct ntnode *, ntfs_times_t *);
+struct timespec	ntfs_nttimetounix( u_int64_t );
+int ntfs_ntreaddir( struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **);
+int ntfs_runtovrun( cn_t **, cn_t **, u_long *, u_int8_t *);
+int ntfs_attrtontvattr( struct ntfsmount *, struct ntvattr **, struct attr * );
+void ntfs_freentvattr( struct ntvattr * );
+int ntfs_loadntvattrs( struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **);
+struct ntvattr * ntfs_findntvattr( struct ntfsmount *, struct ntnode *, u_int32_t, cn_t );
+int ntfs_ntlookupfile(struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **);
+int ntfs_isnamepermitted(struct ntfsmount *, struct attr_indexentry * );
+int ntfs_ntvattrrele(struct ntvattr * );
+int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **);
+int ntfs_ntlookup(struct ntfsmount *, ino_t, struct ntnode **);
+int ntfs_ntget(struct ntnode *);
+void ntfs_ntref(struct ntnode *);
+void ntfs_ntrele(struct ntnode *);
+void ntfs_ntput(struct ntnode *);
+int ntfs_loadntnode( struct ntfsmount *, struct ntnode * );
+int ntfs_writentvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *);
+int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *);
+void ntfs_toupper_init(void);
+void ntfs_toupper_destroy(void);
+int ntfs_toupper_use(struct mount *, struct ntfsmount *);
+void ntfs_toupper_unuse(void);
+int ntfs_fget(struct ntfsmount *, struct ntnode *, int, char *, struct fnode **);
+void ntfs_frele(struct fnode *);
 
 int ntfs_u28_init(struct ntfsmount *ntmp, wchar *u2w);
 int ntfs_u28_uninit(struct ntfsmount *ntmp);
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 48bacbe..5eaa02f 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -64,20 +64,18 @@ MALLOC_DEFINE(M_NTFSDIR,"NTFS dir",  "NTFS dir buffer");
 
 struct sockaddr;
 
-static int	ntfs_root __P((struct mount *, struct vnode **));
-static int	ntfs_statfs __P((struct mount *, struct statfs *,
-				 struct thread *));
-static int	ntfs_unmount __P((struct mount *, int, struct thread *));
-static int	ntfs_vget __P((struct mount *mp, ino_t ino, int lkflags,
-			       struct vnode **vpp));
-static int	ntfs_mountfs __P((register struct vnode *, struct mount *, 
-				  struct ntfs_args *, struct thread *));
-static int	ntfs_vptofh __P((struct vnode *, struct fid *));
-static int	ntfs_fhtovp __P((struct mount *, struct fid *,
-				 struct vnode **));
-static int	ntfs_mount __P((struct mount *, char *, caddr_t,
-				struct nameidata *, struct thread *));
-static int	ntfs_init __P((struct vfsconf *));
+static int	ntfs_root(struct mount *, struct vnode **);
+static int	ntfs_statfs(struct mount *, struct statfs *, struct thread *);
+static int	ntfs_unmount(struct mount *, int, struct thread *);
+static int	ntfs_vget(struct mount *mp, ino_t ino, int lkflags,
+			       struct vnode **vpp);
+static int	ntfs_mountfs(register struct vnode *, struct mount *, 
+				  struct ntfs_args *, struct thread *);
+static int	ntfs_vptofh(struct vnode *, struct fid *);
+static int	ntfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int	ntfs_mount(struct mount *, char *, caddr_t,
+				struct nameidata *, struct thread *);
+static int	ntfs_init(struct vfsconf *);
 
 static int
 ntfs_init (
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 31b910b..f9e09e8 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -70,20 +70,20 @@
 
 #include <sys/unistd.h> /* for pathconf(2) constants */
 
-static int	ntfs_read __P((struct vop_read_args *));
-static int	ntfs_write __P((struct vop_write_args *ap));
-static int	ntfs_getattr __P((struct vop_getattr_args *ap));
-static int	ntfs_inactive __P((struct vop_inactive_args *ap));
-static int	ntfs_print __P((struct vop_print_args *ap));
-static int	ntfs_reclaim __P((struct vop_reclaim_args *ap));
-static int	ntfs_strategy __P((struct vop_strategy_args *ap));
-static int	ntfs_access __P((struct vop_access_args *ap));
-static int	ntfs_open __P((struct vop_open_args *ap));
-static int	ntfs_close __P((struct vop_close_args *ap));
-static int	ntfs_readdir __P((struct vop_readdir_args *ap));
-static int	ntfs_lookup __P((struct vop_lookup_args *ap));
-static int	ntfs_fsync __P((struct vop_fsync_args *ap));
-static int	ntfs_pathconf __P((void *));
+static int	ntfs_read(struct vop_read_args *);
+static int	ntfs_write(struct vop_write_args *ap);
+static int	ntfs_getattr(struct vop_getattr_args *ap);
+static int	ntfs_inactive(struct vop_inactive_args *ap);
+static int	ntfs_print(struct vop_print_args *ap);
+static int	ntfs_reclaim(struct vop_reclaim_args *ap);
+static int	ntfs_strategy(struct vop_strategy_args *ap);
+static int	ntfs_access(struct vop_access_args *ap);
+static int	ntfs_open(struct vop_open_args *ap);
+static int	ntfs_close(struct vop_close_args *ap);
+static int	ntfs_readdir(struct vop_readdir_args *ap);
+static int	ntfs_lookup(struct vop_lookup_args *ap);
+static int	ntfs_fsync(struct vop_fsync_args *ap);
+static int	ntfs_pathconf(void *);
 
 int	ntfs_prtactive = 1;	/* 1 => print out reclaim of active vnodes */
 
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 258f509..c0f4022 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -62,13 +62,13 @@
 
 static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure");
 
-static int	portal_mount __P((struct mount *mp, char *path, caddr_t data,
-				  struct nameidata *ndp, struct thread *td));
-static int	portal_unmount __P((struct mount *mp, int mntflags,
-				    struct thread *td));
-static int	portal_root __P((struct mount *mp, struct vnode **vpp));
-static int	portal_statfs __P((struct mount *mp, struct statfs *sbp,
-				   struct thread *td));
+static int	portal_mount(struct mount *mp, char *path, caddr_t data,
+				  struct nameidata *ndp, struct thread *td);
+static int	portal_unmount(struct mount *mp, int mntflags,
+				    struct thread *td);
+static int	portal_root(struct mount *mp, struct vnode **vpp);
+static int	portal_statfs(struct mount *mp, struct statfs *sbp,
+				   struct thread *td);
 
 /*
  * Mount the per-process file descriptors (/dev/fd)
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 934cf97..b345c57 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -65,15 +65,15 @@
 
 static int portal_fileid = PORTAL_ROOTFILEID+1;
 
-static void	portal_closefd __P((struct thread *td, int fd));
-static int	portal_connect __P((struct socket *so, struct socket *so2));
-static int	portal_getattr __P((struct vop_getattr_args *ap));
-static int	portal_lookup __P((struct vop_lookup_args *ap));
-static int	portal_open __P((struct vop_open_args *ap));
-static int	portal_print __P((struct vop_print_args *ap));
-static int	portal_readdir __P((struct vop_readdir_args *ap));
-static int	portal_reclaim __P((struct vop_reclaim_args *ap));
-static int	portal_setattr __P((struct vop_setattr_args *ap));
+static void	portal_closefd(struct thread *td, int fd);
+static int	portal_connect(struct socket *so, struct socket *so2);
+static int	portal_getattr(struct vop_getattr_args *ap);
+static int	portal_lookup(struct vop_lookup_args *ap);
+static int	portal_open(struct vop_open_args *ap);
+static int	portal_print(struct vop_print_args *ap);
+static int	portal_readdir(struct vop_readdir_args *ap);
+static int	portal_reclaim(struct vop_reclaim_args *ap);
+static int	portal_setattr(struct vop_setattr_args *ap);
 
 static void
 portal_closefd(td, fd)
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 3a73980..3fff9b3 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -108,7 +108,7 @@ static struct namemap signames[] = {
 	{ 0 },
 };
 
-static int	procfs_control __P((struct proc *curp, struct proc *p, int op));
+static int	procfs_control(struct proc *curp, struct proc *p, int op);
 
 static int
 procfs_control(struct proc *curp, struct proc *p, int op)
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index ba0e47b..1db8ea4 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -55,20 +55,20 @@
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 
-static int	spec_advlock __P((struct vop_advlock_args *));
-static int	spec_bmap __P((struct vop_bmap_args *));
-static int	spec_close __P((struct vop_close_args *));
-static int	spec_freeblks __P((struct vop_freeblks_args *));
-static int	spec_fsync __P((struct  vop_fsync_args *));
-static int	spec_getpages __P((struct vop_getpages_args *));
-static int	spec_ioctl __P((struct vop_ioctl_args *));
-static int	spec_kqfilter __P((struct vop_kqfilter_args *));
-static int	spec_open __P((struct vop_open_args *));
-static int	spec_poll __P((struct vop_poll_args *));
-static int	spec_print __P((struct vop_print_args *));
-static int	spec_read __P((struct vop_read_args *));
-static int	spec_strategy __P((struct vop_strategy_args *));
-static int	spec_write __P((struct vop_write_args *));
+static int	spec_advlock(struct vop_advlock_args *);
+static int	spec_bmap(struct vop_bmap_args *);
+static int	spec_close(struct vop_close_args *);
+static int	spec_freeblks(struct vop_freeblks_args *);
+static int	spec_fsync(struct  vop_fsync_args *);
+static int	spec_getpages(struct vop_getpages_args *);
+static int	spec_ioctl(struct vop_ioctl_args *);
+static int	spec_kqfilter(struct vop_kqfilter_args *);
+static int	spec_open(struct vop_open_args *);
+static int	spec_poll(struct vop_poll_args *);
+static int	spec_print(struct vop_print_args *);
+static int	spec_read(struct vop_read_args *);
+static int	spec_strategy(struct vop_strategy_args *);
+static int	spec_write(struct vop_write_args *);
 
 vop_t **spec_vnodeop_p;
 static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
@@ -121,7 +121,7 @@ spec_vnoperate(ap)
 	return (VOCALL(spec_vnodeop_p, ap->a_desc->vdesc_offset, ap));
 }
 
-static void spec_getpages_iodone __P((struct buf *bp));
+static void spec_getpages_iodone(struct buf *bp);
 
 /*
  * Open a special file.
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index eb562ed..6b1e8d7 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -72,16 +72,16 @@ struct umap_node {
 	struct vnode	*umap_vnode;	/* Back pointer to vnode/umap_node */
 };
 
-extern int umapfs_init __P((struct vfsconf *vfsp));
-extern int umap_node_create __P((struct mount *mp, struct vnode *target, struct vnode **vpp));
-extern u_long umap_reverse_findid __P((u_long id, u_long map[][2], int nentries));
-extern void umap_mapids __P((struct mount *v_mount, struct ucred *credp));
+extern int umapfs_init(struct vfsconf *vfsp);
+extern int umap_node_create(struct mount *mp, struct vnode *target, struct vnode **vpp);
+extern u_long umap_reverse_findid(u_long id, u_long map[][2], int nentries);
+extern void umap_mapids(struct mount *v_mount, struct ucred *credp);
 
 #define	MOUNTTOUMAPMOUNT(mp) ((struct umap_mount *)((mp)->mnt_data))
 #define	VTOUMAP(vp) ((struct umap_node *)(vp)->v_data)
 #define UMAPTOV(xp) ((xp)->umap_vnode)
 #ifdef DIAGNOSTIC
-extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
+extern struct vnode *umap_checkvp(struct vnode *vp, char *fil, int lno);
 #define	UMAPVPTOLOWERVP(vp) umap_checkvp((vp), __FILE__, __LINE__)
 #else
 #define	UMAPVPTOLOWERVP(vp) (VTOUMAP(vp)->umap_lowervp)
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 44730bd..02aec89 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -64,11 +64,11 @@
 static LIST_HEAD(umap_node_hashhead, umap_node) *umap_node_hashtbl;
 static u_long umap_node_hash;
 
-static u_long	umap_findid __P((u_long id, u_long map[][2], int nentries));
-static int	umap_node_alloc __P((struct mount *mp, struct vnode *lowervp,
-				     struct vnode **vpp));
+static u_long	umap_findid(u_long id, u_long map[][2], int nentries);
+static int	umap_node_alloc(struct mount *mp, struct vnode *lowervp,
+				     struct vnode **vpp);
 static struct vnode *
-		umap_node_find __P((struct mount *mp, struct vnode *targetvp));
+		umap_node_find(struct mount *mp, struct vnode *targetvp);
 
 /*
  * Initialise cache headers
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 17bfdc1..ebdcf85 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -57,29 +57,29 @@
 
 static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure");
 
-static int	umapfs_fhtovp __P((struct mount *mp, struct fid *fidp,
-				   struct vnode **vpp));
-static int	umapfs_checkexp __P((struct mount *mp, struct sockaddr *nam,
-				    int *extflagsp, struct ucred **credanonp));
-static int	umapfs_mount __P((struct mount *mp, char *path, caddr_t data,
-				  struct nameidata *ndp, struct thread *td));
-static int	umapfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
-				     caddr_t arg, struct thread *td));
-static int	umapfs_root __P((struct mount *mp, struct vnode **vpp));
-static int	umapfs_start __P((struct mount *mp, int flags, struct thread *td));
-static int	umapfs_statfs __P((struct mount *mp, struct statfs *sbp,
-				   struct thread *td));
-static int	umapfs_sync __P((struct mount *mp, int waitfor,
-				 struct ucred *cred, struct thread *td));
-static int	umapfs_unmount __P((struct mount *mp, int mntflags,
-				    struct thread *td));
-static int	umapfs_vget __P((struct mount *mp, ino_t ino, int flags,
-				 struct vnode **vpp));
-static int	umapfs_vptofh __P((struct vnode *vp, struct fid *fhp));
-static int	umapfs_extattrctl __P((struct mount *mp, int cmd,
+static int	umapfs_fhtovp(struct mount *mp, struct fid *fidp,
+				   struct vnode **vpp);
+static int	umapfs_checkexp(struct mount *mp, struct sockaddr *nam,
+				    int *extflagsp, struct ucred **credanonp);
+static int	umapfs_mount(struct mount *mp, char *path, caddr_t data,
+				  struct nameidata *ndp, struct thread *td);
+static int	umapfs_quotactl(struct mount *mp, int cmd, uid_t uid,
+				     caddr_t arg, struct thread *td);
+static int	umapfs_root(struct mount *mp, struct vnode **vpp);
+static int	umapfs_start(struct mount *mp, int flags, struct thread *td);
+static int	umapfs_statfs(struct mount *mp, struct statfs *sbp,
+				   struct thread *td);
+static int	umapfs_sync(struct mount *mp, int waitfor,
+				 struct ucred *cred, struct thread *td);
+static int	umapfs_unmount(struct mount *mp, int mntflags,
+				    struct thread *td);
+static int	umapfs_vget(struct mount *mp, ino_t ino, int flags,
+				 struct vnode **vpp);
+static int	umapfs_vptofh(struct vnode *vp, struct fid *fhp);
+static int	umapfs_extattrctl(struct mount *mp, int cmd,
 				       struct vnode *filename_vp,
 				       int namespace, const char *attrname,
-				       struct thread *td));
+				       struct thread *td);
 
 /*
  * Mount umap layer
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 77a8a14..14abe0f 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -58,14 +58,14 @@ static int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
 SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW,
 	&umap_bug_bypass, 0, "");
 
-static int	umap_bypass __P((struct vop_generic_args *ap));
-static int	umap_getattr __P((struct vop_getattr_args *ap));
-static int	umap_inactive __P((struct vop_inactive_args *ap));
-static int	umap_lock __P((struct vop_lock_args *ap));
-static int	umap_print __P((struct vop_print_args *ap));
-static int	umap_reclaim __P((struct vop_reclaim_args *ap));
-static int	umap_rename __P((struct vop_rename_args *ap));
-static int	umap_unlock __P((struct vop_unlock_args *ap));
+static int	umap_bypass(struct vop_generic_args *ap);
+static int	umap_getattr(struct vop_getattr_args *ap);
+static int	umap_inactive(struct vop_inactive_args *ap);
+static int	umap_lock(struct vop_lock_args *ap);
+static int	umap_print(struct vop_print_args *ap);
+static int	umap_reclaim(struct vop_reclaim_args *ap);
+static int	umap_rename(struct vop_rename_args *ap);
+static int	umap_unlock(struct vop_unlock_args *ap);
 
 /*
  * This is the 10-Apr-92 bypass routine.
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 0caff1a..12d3ef3 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -113,29 +113,29 @@ struct union_node {
 #define UNVP_WANT	0x01
 #define UNVP_LOCKED	0x02
 
-extern int union_allocvp __P((struct vnode **, struct mount *,
+extern int union_allocvp(struct vnode **, struct mount *,
 				struct vnode *, 
 				struct vnode *, 
 				struct componentname *, struct vnode *,
-				struct vnode *, int));
-extern int union_freevp __P((struct vnode *));
-extern struct vnode *union_dircache __P((struct vnode *, struct thread *));
-extern int union_copyup __P((struct union_node *, int, struct ucred *,
-				struct thread *));
-extern int union_dowhiteout __P((struct union_node *, struct ucred *,
-					struct thread *));
-extern int union_mkshadow __P((struct union_mount *, struct vnode *,
-				struct componentname *, struct vnode **));
-extern int union_mkwhiteout __P((struct union_mount *, struct vnode *,
-				struct componentname *, char *));
-extern int union_cn_close __P((struct vnode *, int, struct ucred *,
-				struct thread *));
-extern void union_removed_upper __P((struct union_node *un));
-extern struct vnode *union_lowervp __P((struct vnode *));
-extern void union_newsize __P((struct vnode *, off_t, off_t));
-
-extern int (*union_dircheckp) __P((struct thread *, struct vnode **,
-				 struct file *));
+				struct vnode *, int);
+extern int union_freevp(struct vnode *);
+extern struct vnode *union_dircache(struct vnode *, struct thread *);
+extern int union_copyup(struct union_node *, int, struct ucred *,
+				struct thread *);
+extern int union_dowhiteout(struct union_node *, struct ucred *,
+					struct thread *);
+extern int union_mkshadow(struct union_mount *, struct vnode *,
+				struct componentname *, struct vnode **);
+extern int union_mkwhiteout(struct union_mount *, struct vnode *,
+				struct componentname *, char *);
+extern int union_cn_close(struct vnode *, int, struct ucred *,
+				struct thread *);
+extern void union_removed_upper(struct union_node *un);
+extern struct vnode *union_lowervp(struct vnode *);
+extern void union_newsize(struct vnode *, off_t, off_t);
+
+extern int (*union_dircheckp)(struct thread *, struct vnode **,
+				 struct file *);
 
 #define	MOUNTTOUNIONMOUNT(mp) ((struct union_mount *)((mp)->mnt_data))
 #define	VTOUNION(vp) ((struct union_node *)(vp)->v_data)
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index fde7df5..e5eb7d0 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -62,7 +62,7 @@
 
 #include <sys/proc.h>
 
-extern int	union_init __P((void));
+extern int	union_init(void);
 
 /* must be power of two, otherwise change UNION_HASH() */
 #define NHASH 32
@@ -74,26 +74,26 @@ extern int	union_init __P((void));
 static LIST_HEAD(unhead, union_node) unhead[NHASH];
 static int unvplock[NHASH];
 
-static void	union_dircache_r __P((struct vnode *vp, struct vnode ***vppp,
-				      int *cntp));
-static int	union_list_lock __P((int ix));
-static void	union_list_unlock __P((int ix));
-static int	union_relookup __P((struct union_mount *um, struct vnode *dvp,
+static void	union_dircache_r(struct vnode *vp, struct vnode ***vppp,
+				      int *cntp);
+static int	union_list_lock(int ix);
+static void	union_list_unlock(int ix);
+static int	union_relookup(struct union_mount *um, struct vnode *dvp,
 				    struct vnode **vpp,
 				    struct componentname *cnp,
 				    struct componentname *cn, char *path,
-				    int pathlen));
-static void	union_updatevp __P((struct union_node *un,
+				    int pathlen);
+static void	union_updatevp(struct union_node *un,
 				    struct vnode *uppervp,
-				    struct vnode *lowervp));
-static void union_newlower __P((struct union_node *, struct vnode *));
-static void union_newupper __P((struct union_node *, struct vnode *));
-static int union_copyfile __P((struct vnode *, struct vnode *,
-					struct ucred *, struct thread *));
-static int union_vn_create __P((struct vnode **, struct union_node *,
-				struct thread *));
-static int union_vn_close __P((struct vnode *, int, struct ucred *,
-				struct thread *));
+				    struct vnode *lowervp);
+static void union_newlower(struct union_node *, struct vnode *);
+static void union_newupper(struct union_node *, struct vnode *);
+static int union_copyfile(struct vnode *, struct vnode *,
+					struct ucred *, struct thread *);
+static int union_vn_create(struct vnode **, struct union_node *,
+				struct thread *);
+static int union_vn_close(struct vnode *, int, struct ucred *,
+				struct thread *);
 
 int
 union_init()
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 58f283b..eb48b69 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -57,14 +57,14 @@
 
 static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure");
 
-extern int	union_init __P((struct vfsconf *));
-static int	union_mount __P((struct mount *mp, char *path, caddr_t data,
-				 struct nameidata *ndp, struct thread *td));
-static int	union_root __P((struct mount *mp, struct vnode **vpp));
-static int	union_statfs __P((struct mount *mp, struct statfs *sbp,
-				  struct thread *td));
-static int	union_unmount __P((struct mount *mp, int mntflags,
-				   struct thread *td));
+extern int	union_init(struct vfsconf *);
+static int	union_mount(struct mount *mp, char *path, caddr_t data,
+				 struct nameidata *ndp, struct thread *td);
+static int	union_root(struct mount *mp, struct vnode **vpp);
+static int	union_statfs(struct mount *mp, struct statfs *sbp,
+				  struct thread *td);
+static int	union_unmount(struct mount *mp, int mntflags,
+				   struct thread *td);
 
 /*
  * Mount union filesystem
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 1fbdc50..8035799 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -67,45 +67,45 @@ SYSCTL_INT(_vfs, OID_AUTO, uniondebug, CTLFLAG_RW, &uniondebug, 0, "");
 SYSCTL_INT(_vfs, OID_AUTO, uniondebug, CTLFLAG_RD, &uniondebug, 0, "");
 #endif
 
-static int	union_access __P((struct vop_access_args *ap));
-static int	union_advlock __P((struct vop_advlock_args *ap));
-static int	union_close __P((struct vop_close_args *ap));
-static int	union_create __P((struct vop_create_args *ap));
-static int	union_createvobject __P((struct vop_createvobject_args *ap));
-static int	union_destroyvobject __P((struct vop_destroyvobject_args *ap));
-static int	union_fsync __P((struct vop_fsync_args *ap));
-static int	union_getattr __P((struct vop_getattr_args *ap));
-static int	union_getvobject __P((struct vop_getvobject_args *ap));
-static int	union_inactive __P((struct vop_inactive_args *ap));
-static int	union_ioctl __P((struct vop_ioctl_args *ap));
-static int	union_lease __P((struct vop_lease_args *ap));
-static int	union_link __P((struct vop_link_args *ap));
-static int	union_lock __P((struct vop_lock_args *ap));
-static int	union_lookup __P((struct vop_lookup_args *ap));
-static int	union_lookup1 __P((struct vnode *udvp, struct vnode **dvp,
+static int	union_access(struct vop_access_args *ap);
+static int	union_advlock(struct vop_advlock_args *ap);
+static int	union_close(struct vop_close_args *ap);
+static int	union_create(struct vop_create_args *ap);
+static int	union_createvobject(struct vop_createvobject_args *ap);
+static int	union_destroyvobject(struct vop_destroyvobject_args *ap);
+static int	union_fsync(struct vop_fsync_args *ap);
+static int	union_getattr(struct vop_getattr_args *ap);
+static int	union_getvobject(struct vop_getvobject_args *ap);
+static int	union_inactive(struct vop_inactive_args *ap);
+static int	union_ioctl(struct vop_ioctl_args *ap);
+static int	union_lease(struct vop_lease_args *ap);
+static int	union_link(struct vop_link_args *ap);
+static int	union_lock(struct vop_lock_args *ap);
+static int	union_lookup(struct vop_lookup_args *ap);
+static int	union_lookup1(struct vnode *udvp, struct vnode **dvp,
 				   struct vnode **vpp,
-				   struct componentname *cnp));
-static int	union_mkdir __P((struct vop_mkdir_args *ap));
-static int	union_mknod __P((struct vop_mknod_args *ap));
-static int	union_open __P((struct vop_open_args *ap));
-static int	union_pathconf __P((struct vop_pathconf_args *ap));
-static int	union_print __P((struct vop_print_args *ap));
-static int	union_read __P((struct vop_read_args *ap));
-static int	union_readdir __P((struct vop_readdir_args *ap));
-static int	union_readlink __P((struct vop_readlink_args *ap));
-static int	union_getwritemount __P((struct vop_getwritemount_args *ap));
-static int	union_reclaim __P((struct vop_reclaim_args *ap));
-static int	union_remove __P((struct vop_remove_args *ap));
-static int	union_rename __P((struct vop_rename_args *ap));
-static int	union_revoke __P((struct vop_revoke_args *ap));
-static int	union_rmdir __P((struct vop_rmdir_args *ap));
-static int	union_poll __P((struct vop_poll_args *ap));
-static int	union_setattr __P((struct vop_setattr_args *ap));
-static int	union_strategy __P((struct vop_strategy_args *ap));
-static int	union_symlink __P((struct vop_symlink_args *ap));
-static int	union_unlock __P((struct vop_unlock_args *ap));
-static int	union_whiteout __P((struct vop_whiteout_args *ap));
-static int	union_write __P((struct vop_read_args *ap));
+				   struct componentname *cnp);
+static int	union_mkdir(struct vop_mkdir_args *ap);
+static int	union_mknod(struct vop_mknod_args *ap);
+static int	union_open(struct vop_open_args *ap);
+static int	union_pathconf(struct vop_pathconf_args *ap);
+static int	union_print(struct vop_print_args *ap);
+static int	union_read(struct vop_read_args *ap);
+static int	union_readdir(struct vop_readdir_args *ap);
+static int	union_readlink(struct vop_readlink_args *ap);
+static int	union_getwritemount(struct vop_getwritemount_args *ap);
+static int	union_reclaim(struct vop_reclaim_args *ap);
+static int	union_remove(struct vop_remove_args *ap);
+static int	union_rename(struct vop_rename_args *ap);
+static int	union_revoke(struct vop_revoke_args *ap);
+static int	union_rmdir(struct vop_rmdir_args *ap);
+static int	union_poll(struct vop_poll_args *ap);
+static int	union_setattr(struct vop_setattr_args *ap);
+static int	union_strategy(struct vop_strategy_args *ap);
+static int	union_symlink(struct vop_symlink_args *ap);
+static int	union_unlock(struct vop_unlock_args *ap);
+static int	union_whiteout(struct vop_whiteout_args *ap);
+static int	union_write(struct vop_read_args *ap);
 
 static __inline
 struct vnode *