From af97f2e8752dde1a0154b6958f3a8d508f5a72a5 Mon Sep 17 00:00:00 2001 From: xtraeme <xtraeme@NetBSD.org> Date: Tue, 30 Aug 2005 20:08:01 +0000 Subject: [PATCH] Remove __P() --- sys/miscfs/deadfs/dead_vnops.c | 28 ++++----- sys/miscfs/fdesc/fdesc.h | 12 ++-- sys/miscfs/fdesc/fdesc_vfsops.c | 30 +++++----- sys/miscfs/fdesc/fdesc_vnops.c | 42 ++++++------- sys/miscfs/fifofs/fifo.h | 30 +++++----- sys/miscfs/fifofs/fifo_vnops.c | 8 +-- sys/miscfs/genfs/genfs.h | 54 ++++++++--------- sys/miscfs/genfs/layer.h | 12 ++-- sys/miscfs/genfs/layer_extern.h | 78 ++++++++++++------------ sys/miscfs/genfs/layer_subr.c | 6 +- sys/miscfs/genfs/layer_vnops.c | 8 +-- sys/miscfs/kernfs/kernfs.h | 24 ++++---- sys/miscfs/kernfs/kernfs_subr.c | 12 ++-- sys/miscfs/kernfs/kernfs_vfsops.c | 38 ++++++------ sys/miscfs/kernfs/kernfs_vnops.c | 43 +++++++------- sys/miscfs/nullfs/null.h | 12 ++-- sys/miscfs/nullfs/null_vfsops.c | 10 ++-- sys/miscfs/nullfs/null_vnops.c | 6 +- sys/miscfs/overlay/overlay.h | 6 +- sys/miscfs/overlay/overlay_vfsops.c | 10 ++-- sys/miscfs/overlay/overlay_vnops.c | 8 +-- sys/miscfs/portal/portal.h | 4 +- sys/miscfs/portal/portal_vfsops.c | 36 +++++------ sys/miscfs/portal/portal_vnops.c | 32 +++++----- sys/miscfs/procfs/procfs.h | 92 ++++++++++++++--------------- sys/miscfs/procfs/procfs_ctl.c | 6 +- sys/miscfs/procfs/procfs_map.c | 8 +-- sys/miscfs/procfs/procfs_subr.c | 10 ++-- sys/miscfs/procfs/procfs_vfsops.c | 36 +++++------ sys/miscfs/procfs/procfs_vnops.c | 40 ++++++------- sys/miscfs/specfs/spec_vnops.c | 8 +-- sys/miscfs/specfs/specdev.h | 36 +++++------ sys/miscfs/syncfs/sync_vnops.c | 6 +- sys/miscfs/syncfs/syncfs.h | 20 +++---- sys/miscfs/umapfs/umap.h | 10 ++-- sys/miscfs/umapfs/umap_subr.c | 10 ++-- sys/miscfs/umapfs/umap_vfsops.c | 10 ++-- sys/miscfs/umapfs/umap_vnops.c | 16 ++--- 38 files changed, 429 insertions(+), 428 deletions(-) diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index 424c52993d4b..9869efff4ef0 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: dead_vnops.c,v 1.35 2004/04/27 17:37:31 jrf Exp $ */ +/* $NetBSD: dead_vnops.c,v 1.36 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1989, 1993 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.35 2004/04/27 17:37:31 jrf Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.36 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,20 +48,20 @@ __KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.35 2004/04/27 17:37:31 jrf Exp $"); /* * Prototypes for dead operations on vnodes. */ -int dead_lookup __P((void *)); +int dead_lookup(void *); #define dead_create genfs_badop #define dead_mknod genfs_badop -int dead_open __P((void *)); +int dead_open(void *); #define dead_close genfs_nullop #define dead_access genfs_ebadf #define dead_getattr genfs_ebadf #define dead_setattr genfs_ebadf -int dead_read __P((void *)); -int dead_write __P((void *)); +int dead_read(void *); +int dead_write(void *); #define dead_lease_check genfs_nullop #define dead_fcntl genfs_nullop -int dead_ioctl __P((void *)); -int dead_poll __P((void *)); +int dead_ioctl(void *); +int dead_poll(void *); #define dead_mmap genfs_badop #define dead_fsync genfs_nullop #define dead_seek genfs_nullop @@ -76,11 +76,11 @@ int dead_poll __P((void *)); #define dead_abortop genfs_badop #define dead_inactive genfs_nullop #define dead_reclaim genfs_nullop -int dead_lock __P((void *)); +int dead_lock(void *); #define dead_unlock genfs_nullop -int dead_bmap __P((void *)); -int dead_strategy __P((void *)); -int dead_print __P((void *)); +int dead_bmap(void *); +int dead_strategy(void *); +int dead_print(void *); #define dead_islocked genfs_nullop #define dead_pathconf genfs_ebadf #define dead_advlock genfs_ebadf @@ -93,9 +93,9 @@ int dead_print __P((void *)); #define dead_revoke genfs_nullop #define dead_putpages genfs_null_putpages -int chkvnlock __P((struct vnode *)); +int chkvnlock(struct vnode *); -int (**dead_vnodeop_p) __P((void *)); +int (**dead_vnodeop_p)(void *); const struct vnodeopv_entry_desc dead_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h index fa08bddf8e83..3a1d754b6793 100644 --- a/sys/miscfs/fdesc/fdesc.h +++ b/sys/miscfs/fdesc/fdesc.h @@ -1,4 +1,4 @@ -/* $NetBSD: fdesc.h,v 1.16 2004/05/20 06:34:30 atatat Exp $ */ +/* $NetBSD: fdesc.h,v 1.17 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -71,11 +71,11 @@ struct fdescnode { #define VTOFDESC(vp) ((struct fdescnode *)(vp)->v_data) extern dev_t devctty; -extern void fdesc_init __P((void)); -extern void fdesc_done __P((void)); -extern int fdesc_root __P((struct mount *, struct vnode **)); -extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **)); -extern int (**fdesc_vnodeop_p) __P((void *)); +extern void fdesc_init(void); +extern void fdesc_done(void); +extern int fdesc_root(struct mount *, struct vnode **); +extern int fdesc_allocvp(fdntype, int, struct mount *, struct vnode **); +extern int (**fdesc_vnodeop_p)(void *); extern struct vfsops fdesc_vfsops; #ifdef SYSCTL_SETUP_PROTO diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c index 37921ad7bc90..dee6082965fc 100644 --- a/sys/miscfs/fdesc/fdesc_vfsops.c +++ b/sys/miscfs/fdesc/fdesc_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdesc_vfsops.c,v 1.55 2005/05/29 21:55:33 christos Exp $ */ +/* $NetBSD: fdesc_vfsops.c,v 1.56 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993, 1995 @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.55 2005/05/29 21:55:33 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.56 2005/08/30 20:08:01 xtraeme Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -61,19 +61,19 @@ __KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.55 2005/05/29 21:55:33 christos E #include <sys/malloc.h> #include <miscfs/fdesc/fdesc.h> -int fdesc_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -int fdesc_start __P((struct mount *, int, struct proc *)); -int fdesc_unmount __P((struct mount *, int, struct proc *)); -int fdesc_quotactl __P((struct mount *, int, uid_t, void *, - struct proc *)); -int fdesc_statvfs __P((struct mount *, struct statvfs *, struct proc *)); -int fdesc_sync __P((struct mount *, int, struct ucred *, struct proc *)); -int fdesc_vget __P((struct mount *, ino_t, struct vnode **)); -int fdesc_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -int fdesc_checkexp __P((struct mount *, struct mbuf *, int *, - struct ucred **)); -int fdesc_vptofh __P((struct vnode *, struct fid *)); +int fdesc_mount(struct mount *, const char *, void *, + struct nameidata *, struct proc *); +int fdesc_start(struct mount *, int, struct proc *); +int fdesc_unmount(struct mount *, int, struct proc *); +int fdesc_quotactl(struct mount *, int, uid_t, void *, + struct proc *); +int fdesc_statvfs(struct mount *, struct statvfs *, struct proc *); +int fdesc_sync(struct mount *, int, struct ucred *, struct proc *); +int fdesc_vget(struct mount *, ino_t, struct vnode **); +int fdesc_fhtovp(struct mount *, struct fid *, struct vnode **); +int fdesc_checkexp(struct mount *, struct mbuf *, int *, + struct ucred **); +int fdesc_vptofh(struct vnode *, struct fid *); /* * Mount the per-process file descriptors (/dev/fd) diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index e9add92c89e6..9169a7db94ff 100644 --- a/sys/miscfs/fdesc/fdesc_vnops.c +++ b/sys/miscfs/fdesc/fdesc_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdesc_vnops.c,v 1.85 2005/08/19 02:04:03 christos Exp $ */ +/* $NetBSD: fdesc_vnops.c,v 1.86 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.85 2005/08/19 02:04:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.86 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -84,40 +84,40 @@ FD_STDIN, FD_STDOUT, FD_STDERR must be a sequence n, n+1, n+2 LIST_HEAD(fdhashhead, fdescnode) *fdhashtbl; u_long fdhash; -int fdesc_lookup __P((void *)); +int fdesc_lookup(void *); #define fdesc_create genfs_eopnotsupp #define fdesc_mknod genfs_eopnotsupp -int fdesc_open __P((void *)); +int fdesc_open(void *); #define fdesc_close genfs_nullop #define fdesc_access genfs_nullop -int fdesc_getattr __P((void *)); -int fdesc_setattr __P((void *)); -int fdesc_read __P((void *)); -int fdesc_write __P((void *)); -int fdesc_ioctl __P((void *)); -int fdesc_poll __P((void *)); -int fdesc_kqfilter __P((void *)); +int fdesc_getattr(void *); +int fdesc_setattr(void *); +int fdesc_read(void *); +int fdesc_write(void *); +int fdesc_ioctl(void *); +int fdesc_poll(void *); +int fdesc_kqfilter(void *); #define fdesc_mmap genfs_eopnotsupp #define fdesc_fcntl genfs_fcntl #define fdesc_fsync genfs_nullop #define fdesc_seek genfs_seek #define fdesc_remove genfs_eopnotsupp -int fdesc_link __P((void *)); +int fdesc_link(void *); #define fdesc_rename genfs_eopnotsupp #define fdesc_mkdir genfs_eopnotsupp #define fdesc_rmdir genfs_eopnotsupp -int fdesc_symlink __P((void *)); -int fdesc_readdir __P((void *)); -int fdesc_readlink __P((void *)); +int fdesc_symlink(void *); +int fdesc_readdir(void *); +int fdesc_readlink(void *); #define fdesc_abortop genfs_abortop -int fdesc_inactive __P((void *)); -int fdesc_reclaim __P((void *)); +int fdesc_inactive(void *); +int fdesc_reclaim(void *); #define fdesc_lock genfs_lock #define fdesc_unlock genfs_unlock #define fdesc_bmap genfs_badop #define fdesc_strategy genfs_badop -int fdesc_print __P((void *)); -int fdesc_pathconf __P((void *)); +int fdesc_print(void *); +int fdesc_pathconf(void *); #define fdesc_islocked genfs_islocked #define fdesc_advlock genfs_einval #define fdesc_blkatoff genfs_eopnotsupp @@ -129,9 +129,9 @@ int fdesc_pathconf __P((void *)); #define fdesc_revoke genfs_revoke #define fdesc_putpages genfs_null_putpages -static int fdesc_attr __P((int, struct vattr *, struct ucred *, struct proc *)); +static int fdesc_attr(int, struct vattr *, struct ucred *, struct proc *); -int (**fdesc_vnodeop_p) __P((void *)); +int (**fdesc_vnodeop_p)(void *); const struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, fdesc_lookup }, /* lookup */ diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h index 68cde6eeea8c..97b93727c370 100644 --- a/sys/miscfs/fifofs/fifo.h +++ b/sys/miscfs/fifofs/fifo.h @@ -1,4 +1,4 @@ -/* $NetBSD: fifo.h,v 1.21 2004/06/16 19:22:26 wrstuden Exp $ */ +/* $NetBSD: fifo.h,v 1.22 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1991, 1993 @@ -34,20 +34,20 @@ /* * Prototypes for fifo operations on vnodes. */ -int fifo_lookup __P((void *)); +int fifo_lookup(void *); #define fifo_create genfs_badop #define fifo_mknod genfs_badop -int fifo_open __P((void *)); -int fifo_close __P((void *)); +int fifo_open(void *); +int fifo_close(void *); #define fifo_access genfs_ebadf #define fifo_getattr genfs_ebadf #define fifo_setattr genfs_ebadf -int fifo_read __P((void *)); -int fifo_write __P((void *)); +int fifo_read(void *); +int fifo_write(void *); #define fifo_lease_check genfs_nullop -int fifo_ioctl __P((void *)); -int fifo_poll __P((void *)); -int fifo_kqfilter __P((void *)); +int fifo_ioctl(void *); +int fifo_poll(void *); +int fifo_kqfilter(void *); #define fifo_revoke genfs_revoke #define fifo_mmap genfs_badop #define fifo_fsync genfs_nullop @@ -64,12 +64,12 @@ int fifo_kqfilter __P((void *)); #define fifo_reclaim genfs_nullop #define fifo_lock genfs_lock #define fifo_unlock genfs_unlock -int fifo_inactive __P((void *)); -int fifo_bmap __P((void *)); +int fifo_inactive(void *); +int fifo_bmap(void *); #define fifo_strategy genfs_badop -int fifo_print __P((void *)); +int fifo_print(void *); #define fifo_islocked genfs_islocked -int fifo_pathconf __P((void *)); +int fifo_pathconf(void *); #define fifo_advlock genfs_einval #define fifo_blkatoff genfs_badop #define fifo_valloc genfs_badop @@ -80,6 +80,6 @@ int fifo_pathconf __P((void *)); #define fifo_bwrite genfs_nullop #define fifo_putpages genfs_null_putpages -void fifo_printinfo __P((struct vnode *)); +void fifo_printinfo(struct vnode *); -extern int (**fifo_vnodeop_p) __P((void *)); +extern int (**fifo_vnodeop_p)(void *); diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 9eac4969feed..ce7ec7a52bfd 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: fifo_vnops.c,v 1.51 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: fifo_vnops.c,v 1.52 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1990, 1993, 1995 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.51 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.52 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,7 +66,7 @@ struct fifoinfo { long fi_writers; }; -int (**fifo_vnodeop_p) __P((void *)); +int (**fifo_vnodeop_p)(void *); const struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, fifo_lookup }, /* lookup */ @@ -113,7 +113,7 @@ const struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_update_desc, fifo_update }, /* update */ { &vop_bwrite_desc, fifo_bwrite }, /* bwrite */ { &vop_putpages_desc, fifo_putpages }, /* putpages */ - { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL } + { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL } }; const struct vnodeopv_desc fifo_vnodeop_opv_desc = { &fifo_vnodeop_p, fifo_vnodeop_entries }; diff --git a/sys/miscfs/genfs/genfs.h b/sys/miscfs/genfs/genfs.h index 40d50abf2cf4..853c3d0a9e21 100644 --- a/sys/miscfs/genfs/genfs.h +++ b/sys/miscfs/genfs/genfs.h @@ -1,29 +1,29 @@ -/* $NetBSD: genfs.h,v 1.17 2003/04/10 21:53:32 jdolecek Exp $ */ +/* $NetBSD: genfs.h,v 1.18 2005/08/30 20:08:01 xtraeme Exp $ */ -int genfs_badop __P((void *)); -int genfs_nullop __P((void *)); -int genfs_enoioctl __P((void *)); -int genfs_enoextops __P((void *)); -int genfs_einval __P((void *)); -int genfs_eopnotsupp __P((void *)); -int genfs_ebadf __P((void *)); -int genfs_nolock __P((void *)); -int genfs_noislocked __P((void *)); -int genfs_nounlock __P((void *)); +int genfs_badop(void *); +int genfs_nullop(void *); +int genfs_enoioctl(void *); +int genfs_enoextops(void *); +int genfs_einval(void *); +int genfs_eopnotsupp(void *); +int genfs_ebadf(void *); +int genfs_nolock(void *); +int genfs_noislocked(void *); +int genfs_nounlock(void *); -int genfs_poll __P((void *)); -int genfs_kqfilter __P((void *)); -int genfs_fcntl __P((void *)); -int genfs_fsync __P((void *)); -int genfs_seek __P((void *)); -int genfs_abortop __P((void *)); -int genfs_revoke __P((void *)); -int genfs_lease_check __P((void *)); -int genfs_lock __P((void *)); -int genfs_islocked __P((void *)); -int genfs_unlock __P((void *)); -int genfs_mmap __P((void *)); -int genfs_getpages __P((void *)); -int genfs_putpages __P((void *)); -int genfs_null_putpages __P((void *)); -int genfs_compat_getpages __P((void *)); +int genfs_poll(void *); +int genfs_kqfilter(void *); +int genfs_fcntl(void *); +int genfs_fsync(void *); +int genfs_seek(void *); +int genfs_abortop(void *); +int genfs_revoke(void *); +int genfs_lease_check(void *); +int genfs_lock(void *); +int genfs_islocked(void *); +int genfs_unlock(void *); +int genfs_mmap(void *); +int genfs_getpages(void *); +int genfs_putpages(void *); +int genfs_null_putpages(void *); +int genfs_compat_getpages(void *); diff --git a/sys/miscfs/genfs/layer.h b/sys/miscfs/genfs/layer.h index 518cb1180274..0faaf71a72cb 100644 --- a/sys/miscfs/genfs/layer.h +++ b/sys/miscfs/genfs/layer.h @@ -1,4 +1,4 @@ -/* $NetBSD: layer.h,v 1.7 2005/07/24 17:33:24 erh Exp $ */ +/* $NetBSD: layer.h,v 1.8 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -90,12 +90,12 @@ struct layer_mount { u_int layerm_size; /* size of fs's struct node */ enum vtype layerm_tag; /* vtag of our vnodes */ int /* bypass routine for this mount */ - (*layerm_bypass) __P((void *)); + (*layerm_bypass)(void *); int (*layerm_alloc) /* alloc a new layer node */ - __P((struct mount *, struct vnode *, - struct vnode **)); + (struct mount *, struct vnode *, + struct vnode **); int (**layerm_vnodeop_p) /* ops for our nodes */ - __P((void *)); + (void *); struct layer_node_hashhead /* head of hash list for layer_nodes */ *layerm_node_hashtbl; u_long layerm_node_hash; /* hash mask for hash chain */ @@ -148,7 +148,7 @@ struct layer_node { #define LAYERFS_DO_BYPASS(vp, ap) \ (*MOUNTTOLAYERMOUNT((vp)->v_mount)->layerm_bypass)((ap)) -struct vnode *layer_checkvp __P((struct vnode *vp, const char *fil, int lno)); +struct vnode *layer_checkvp(struct vnode *vp, const char *fil, int lno); #define MOUNTTOLAYERMOUNT(mp) ((struct layer_mount *)((mp)->mnt_data)) #define VTOLAYER(vp) ((struct layer_node *)(vp)->v_data) diff --git a/sys/miscfs/genfs/layer_extern.h b/sys/miscfs/genfs/layer_extern.h index 9b8de6afd16a..87e0b09eac2a 100644 --- a/sys/miscfs/genfs/layer_extern.h +++ b/sys/miscfs/genfs/layer_extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: layer_extern.h,v 1.17 2004/06/30 17:42:55 hannken Exp $ */ +/* $NetBSD: layer_extern.h,v 1.18 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -70,50 +70,50 @@ */ /* misc routines in layer_subr.c */ -void layerfs_init __P((void)); -void layerfs_done __P((void)); -int layer_node_alloc __P((struct mount *, struct vnode *, struct vnode **)); -int layer_node_create __P((struct mount *, struct vnode *, struct vnode **)); +void layerfs_init(void); +void layerfs_done(void); +int layer_node_alloc(struct mount *, struct vnode *, struct vnode **); +int layer_node_create(struct mount *, struct vnode *, struct vnode **); struct vnode * - layer_node_find __P((struct mount *, struct vnode *)); + layer_node_find(struct mount *, struct vnode *); #define LOG2_SIZEVNODE 7 /* log2(sizeof struct vnode) */ #define LAYER_NHASH(lmp, vp) \ (&((lmp)->layerm_node_hashtbl[(((u_long)vp)>>LOG2_SIZEVNODE) & \ (lmp)->layerm_node_hash])) /* vfs routines */ -int layerfs_start __P((struct mount *, int, struct proc *)); -int layerfs_root __P((struct mount *, struct vnode **)); -int layerfs_quotactl __P((struct mount *, int, uid_t, void *, - struct proc *)); -int layerfs_statvfs __P((struct mount *, struct statvfs *, struct proc *)); -int layerfs_sync __P((struct mount *, int, struct ucred *, struct proc *)); -int layerfs_vget __P((struct mount *, ino_t, struct vnode **)); -int layerfs_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -int layerfs_checkexp __P((struct mount *, struct mbuf *, int *, - struct ucred **)); -int layerfs_vptofh __P((struct vnode *, struct fid *)); -int layerfs_snapshot __P((struct mount *, struct vnode *, - struct timespec *)); +int layerfs_start(struct mount *, int, struct proc *); +int layerfs_root(struct mount *, struct vnode **); +int layerfs_quotactl(struct mount *, int, uid_t, void *, + struct proc *); +int layerfs_statvfs(struct mount *, struct statvfs *, struct proc *); +int layerfs_sync(struct mount *, int, struct ucred *, struct proc *); +int layerfs_vget(struct mount *, ino_t, struct vnode **); +int layerfs_fhtovp(struct mount *, struct fid *, struct vnode **); +int layerfs_checkexp(struct mount *, struct mbuf *, int *, + struct ucred **); +int layerfs_vptofh(struct vnode *, struct fid *); +int layerfs_snapshot(struct mount *, struct vnode *, + struct timespec *); /* VOP routines */ -int layer_bypass __P((void *)); -int layer_getattr __P((void *)); -int layer_inactive __P((void *)); -int layer_reclaim __P((void *)); -int layer_print __P((void *)); -int layer_bwrite __P((void *)); -int layer_bmap __P((void *)); -int layer_lock __P((void *)); -int layer_unlock __P((void *)); -int layer_islocked __P((void *)); -int layer_fsync __P((void *)); -int layer_lookup __P((void *)); -int layer_setattr __P((void *)); -int layer_access __P((void *)); -int layer_open __P((void *)); -int layer_remove __P((void *)); -int layer_rename __P((void *)); -int layer_rmdir __P((void *)); -int layer_getpages __P((void *)); -int layer_putpages __P((void *)); +int layer_bypass(void *); +int layer_getattr(void *); +int layer_inactive(void *); +int layer_reclaim(void *); +int layer_print(void *); +int layer_bwrite(void *); +int layer_bmap(void *); +int layer_lock(void *); +int layer_unlock(void *); +int layer_islocked(void *); +int layer_fsync(void *); +int layer_lookup(void *); +int layer_setattr(void *); +int layer_access(void *); +int layer_open(void *); +int layer_remove(void *); +int layer_rename(void *); +int layer_rmdir(void *); +int layer_getpages(void *); +int layer_putpages(void *); diff --git a/sys/miscfs/genfs/layer_subr.c b/sys/miscfs/genfs/layer_subr.c index e79622d0291a..7069f4b76a53 100644 --- a/sys/miscfs/genfs/layer_subr.c +++ b/sys/miscfs/genfs/layer_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: layer_subr.c,v 1.16 2005/07/24 17:33:24 erh Exp $ */ +/* $NetBSD: layer_subr.c,v 1.17 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.16 2005/07/24 17:33:24 erh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.17 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -192,7 +192,7 @@ layer_node_alloc(mp, lowervp, vpp) struct layer_node *xp; struct vnode *vp, *nvp; int error; - extern int (**dead_vnodeop_p) __P((void *)); + extern int (**dead_vnodeop_p)(void *); if ((error = getnewvnode(lmp->layerm_tag, mp, lmp->layerm_vnodeop_p, &vp)) != 0) diff --git a/sys/miscfs/genfs/layer_vnops.c b/sys/miscfs/genfs/layer_vnops.c index b6d850d252dc..be4477f1c5a8 100644 --- a/sys/miscfs/genfs/layer_vnops.c +++ b/sys/miscfs/genfs/layer_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: layer_vnops.c,v 1.24 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: layer_vnops.c,v 1.25 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -67,7 +67,7 @@ * * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 - * $Id: layer_vnops.c,v 1.24 2005/02/26 22:59:00 perry Exp $ + * $Id: layer_vnops.c,v 1.25 2005/08/30 20:08:01 xtraeme Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project */ @@ -232,7 +232,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.24 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: layer_vnops.c,v 1.25 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -288,7 +288,7 @@ layer_bypass(v) struct vnodeop_desc *a_desc; <other random data follows, presumably> } */ *ap = v; - int (**our_vnodeop_p) __P((void *)); + int (**our_vnodeop_p)(void *); struct vnode **this_vp_p; int error, error1; struct vnode *old_vps[VDESC_MAX_VPS], *vp0; diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h index 30e5429aa6d8..8d1d34751acd 100644 --- a/sys/miscfs/kernfs/kernfs.h +++ b/sys/miscfs/kernfs/kernfs.h @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs.h,v 1.24 2005/05/20 13:16:54 chs Exp $ */ +/* $NetBSD: kernfs.h,v 1.25 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -121,24 +121,24 @@ struct kernfs_mount { extern const struct kern_target kern_targets[]; extern int nkern_targets; extern const int static_nkern_targets; -extern int (**kernfs_vnodeop_p) __P((void *)); +extern int (**kernfs_vnodeop_p)(void *); extern struct vfsops kernfs_vfsops; extern dev_t rrootdev; struct secasvar; struct secpolicy; -int kernfs_root __P((struct mount *, struct vnode **)); +int kernfs_root(struct mount *, struct vnode **); -void kernfs_hashinit __P((void)); -void kernfs_hashreinit __P((void)); -void kernfs_hashdone __P((void)); -int kernfs_freevp __P((struct vnode *)); -int kernfs_allocvp __P((struct mount *, struct vnode **, kfstype, - const struct kern_target *, u_int32_t)); +void kernfs_hashinit(void); +void kernfs_hashreinit(void); +void kernfs_hashdone(void); +int kernfs_freevp(struct vnode *); +int kernfs_allocvp(struct mount *, struct vnode **, kfstype, + const struct kern_target *, u_int32_t); -void kernfs_revoke_sa __P((struct secasvar *)); -void kernfs_revoke_sp __P((struct secpolicy *)); +void kernfs_revoke_sa(struct secasvar *); +void kernfs_revoke_sp(struct secpolicy *); /* * Data types for the kernfs file operations. @@ -189,7 +189,7 @@ kfstype kernfs_alloctype(int, const struct kernfs_fileop *); (dkt)->dkt_kt.kt_mode = (mode); \ } while (/*CONSTCOND*/0) #define KERNFS_ENTOPARENTDIR(dkt) &(dkt)->dkt_kt -int kernfs_addentry __P((kernfs_parentdir_t *, kernfs_entry_t *)); +int kernfs_addentry(kernfs_parentdir_t *, kernfs_entry_t *); #ifdef SYSCTL_SETUP_PROTO SYSCTL_SETUP_PROTO(sysctl_vfs_kernfs_setup); diff --git a/sys/miscfs/kernfs/kernfs_subr.c b/sys/miscfs/kernfs/kernfs_subr.c index d9ca03db61c3..5b43c6d30744 100644 --- a/sys/miscfs/kernfs/kernfs_subr.c +++ b/sys/miscfs/kernfs/kernfs_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_subr.c,v 1.7 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: kernfs_subr.c,v 1.8 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1993 @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kernfs_subr.c,v 1.7 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kernfs_subr.c,v 1.8 2005/08/30 20:08:01 xtraeme Exp $"); #ifdef _KERNEL_OPT #include "opt_ipsec.h" @@ -102,10 +102,10 @@ __KERNEL_RCSID(0, "$NetBSD: kernfs_subr.c,v 1.7 2005/02/26 22:59:00 perry Exp $" #include <netkey/key.h> #endif -void kernfs_hashins __P((struct kernfs_node *)); -void kernfs_hashrem __P((struct kernfs_node *)); -struct vnode *kernfs_hashget __P((kfstype, struct mount *, - const struct kern_target *, u_int32_t)); +void kernfs_hashins(struct kernfs_node *); +void kernfs_hashrem(struct kernfs_node *); +struct vnode *kernfs_hashget(kfstype, struct mount *, + const struct kern_target *, u_int32_t); static LIST_HEAD(kfs_hashhead, kernfs_node) *kfs_hashtbl; static u_long kfs_ihash; /* size of hash table - 1 */ diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index 384d84f894a5..e2cf9ecedae8 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vfsops.c,v 1.67 2005/03/29 02:41:05 thorpej Exp $ */ +/* $NetBSD: kernfs_vfsops.c,v 1.68 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993, 1995 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.67 2005/03/29 02:41:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.68 2005/08/30 20:08:01 xtraeme Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -64,23 +64,23 @@ MALLOC_DEFINE(M_KERNFSMNT, "kernfs mount", "kernfs mount structures"); dev_t rrootdev = NODEV; -void kernfs_init __P((void)); -void kernfs_reinit __P((void)); -void kernfs_done __P((void)); -void kernfs_get_rrootdev __P((void)); -int kernfs_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -int kernfs_start __P((struct mount *, int, struct proc *)); -int kernfs_unmount __P((struct mount *, int, struct proc *)); -int kernfs_statvfs __P((struct mount *, struct statvfs *, struct proc *)); -int kernfs_quotactl __P((struct mount *, int, uid_t, void *, - struct proc *)); -int kernfs_sync __P((struct mount *, int, struct ucred *, struct proc *)); -int kernfs_vget __P((struct mount *, ino_t, struct vnode **)); -int kernfs_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -int kernfs_checkexp __P((struct mount *, struct mbuf *, int *, - struct ucred **)); -int kernfs_vptofh __P((struct vnode *, struct fid *)); +void kernfs_init(void); +void kernfs_reinit(void); +void kernfs_done(void); +void kernfs_get_rrootdev(void); +int kernfs_mount(struct mount *, const char *, void *, + struct nameidata *, struct proc *); +int kernfs_start(struct mount *, int, struct proc *); +int kernfs_unmount(struct mount *, int, struct proc *); +int kernfs_statvfs(struct mount *, struct statvfs *, struct proc *); +int kernfs_quotactl(struct mount *, int, uid_t, void *, + struct proc *); +int kernfs_sync(struct mount *, int, struct ucred *, struct proc *); +int kernfs_vget(struct mount *, ino_t, struct vnode **); +int kernfs_fhtovp(struct mount *, struct fid *, struct vnode **); +int kernfs_checkexp(struct mount *, struct mbuf *, int *, + struct ucred **); +int kernfs_vptofh(struct vnode *, struct fid *); void kernfs_init() diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index 758ccb443505..2fadad572f4c 100644 --- a/sys/miscfs/kernfs/kernfs_vnops.c +++ b/sys/miscfs/kernfs/kernfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vnops.c,v 1.109 2005/05/29 21:55:33 christos Exp $ */ +/* $NetBSD: kernfs_vnops.c,v 1.110 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.109 2005/05/29 21:55:33 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.110 2005/08/30 20:08:01 xtraeme Exp $"); #ifdef _KERNEL_OPT #include "opt_ipsec.h" @@ -168,40 +168,40 @@ const struct kernfs_fileop kernfs_default_fileops[] = { { .kf_fileop = KERNFS_FILEOP_WRITE, .kf_genop = {kernfs_default_xwrite} }, }; -int kernfs_lookup __P((void *)); +int kernfs_lookup(void *); #define kernfs_create genfs_eopnotsupp #define kernfs_mknod genfs_eopnotsupp -int kernfs_open __P((void *)); -int kernfs_close __P((void *)); -int kernfs_access __P((void *)); -int kernfs_getattr __P((void *)); -int kernfs_setattr __P((void *)); -int kernfs_read __P((void *)); -int kernfs_write __P((void *)); +int kernfs_open(void *); +int kernfs_close(void *); +int kernfs_access(void *); +int kernfs_getattr(void *); +int kernfs_setattr(void *); +int kernfs_read(void *); +int kernfs_write(void *); #define kernfs_fcntl genfs_fcntl -int kernfs_ioctl __P((void *)); +int kernfs_ioctl(void *); #define kernfs_poll genfs_poll #define kernfs_revoke genfs_revoke #define kernfs_fsync genfs_nullop #define kernfs_seek genfs_nullop #define kernfs_remove genfs_eopnotsupp -int kernfs_link __P((void *)); +int kernfs_link(void *); #define kernfs_rename genfs_eopnotsupp #define kernfs_mkdir genfs_eopnotsupp #define kernfs_rmdir genfs_eopnotsupp -int kernfs_symlink __P((void *)); -int kernfs_readdir __P((void *)); +int kernfs_symlink(void *); +int kernfs_readdir(void *); #define kernfs_readlink genfs_eopnotsupp #define kernfs_abortop genfs_abortop -int kernfs_inactive __P((void *)); -int kernfs_reclaim __P((void *)); +int kernfs_inactive(void *); +int kernfs_reclaim(void *); #define kernfs_lock genfs_lock #define kernfs_unlock genfs_unlock #define kernfs_bmap genfs_badop #define kernfs_strategy genfs_badop -int kernfs_print __P((void *)); +int kernfs_print(void *); #define kernfs_islocked genfs_islocked -int kernfs_pathconf __P((void *)); +int kernfs_pathconf(void *); #define kernfs_advlock genfs_einval #define kernfs_blkatoff genfs_eopnotsupp #define kernfs_valloc genfs_eopnotsupp @@ -211,10 +211,11 @@ int kernfs_pathconf __P((void *)); #define kernfs_bwrite genfs_eopnotsupp #define kernfs_putpages genfs_putpages -static int kernfs_xread __P((struct kernfs_node *, int, char **, size_t, size_t *)); -static int kernfs_xwrite __P((const struct kernfs_node *, char *, size_t)); +static int kernfs_xread(struct kernfs_node *, int, char **, + size_t, size_t *); +static int kernfs_xwrite(const struct kernfs_node *, char *, size_t); -int (**kernfs_vnodeop_p) __P((void *)); +int (**kernfs_vnodeop_p)(void *); const struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, kernfs_lookup }, /* lookup */ diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h index 00f0b0a7aab9..df99ee4f5768 100644 --- a/sys/miscfs/nullfs/null.h +++ b/sys/miscfs/nullfs/null.h @@ -1,4 +1,4 @@ -/* $NetBSD: null.h,v 1.15 2004/05/20 06:34:30 atatat Exp $ */ +/* $NetBSD: null.h,v 1.16 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -104,23 +104,23 @@ struct null_node { #define null_vnode ln.layer_vnode #define null_flags ln.layer_flags -int null_node_create __P((struct mount *, struct vnode *, - struct vnode **)); +int null_node_create(struct mount *, struct vnode *, + struct vnode **); #define MOUNTTONULLMOUNT(mp) ((struct null_mount *)((mp)->mnt_data)) #define VTONULL(vp) ((struct null_node *)(vp)->v_data) #define NULLTOV(xp) ((xp)->null_vnode) #ifdef NULLFS_DIAGNOSTIC -struct vnode *layer_checkvp __P((struct vnode *, char *, int)); +struct vnode *layer_checkvp(struct vnode *, char *, int); #define NULLVPTOLOWERVP(vp) layer_checkvp((vp), __FILE__, __LINE__) #else #define NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp) #endif -extern int (**null_vnodeop_p) __P((void *)); +extern int (**null_vnodeop_p)(void *); extern struct vfsops nullfs_vfsops; -void nullfs_init __P((void)); +void nullfs_init(void); #ifdef SYSCTL_SETUP_PROTO SYSCTL_SETUP_PROTO(sysctl_vfs_null_setup); diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index 8999543b1552..5ec549231cc7 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: null_vfsops.c,v 1.55 2005/03/29 02:41:05 thorpej Exp $ */ +/* $NetBSD: null_vfsops.c,v 1.56 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.55 2005/03/29 02:41:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.56 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,9 +89,9 @@ __KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.55 2005/03/29 02:41:05 thorpej Exp #include <miscfs/nullfs/null.h> #include <miscfs/genfs/layer_extern.h> -int nullfs_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -int nullfs_unmount __P((struct mount *, int, struct proc *)); +int nullfs_mount(struct mount *, const char *, void *, + struct nameidata *, struct proc *); +int nullfs_unmount(struct mount *, int, struct proc *); /* * Mount null layer diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index 9e96f8d9f1dc..00344dfd31be 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: null_vnops.c,v 1.32 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: null_vnops.c,v 1.33 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -203,7 +203,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: null_vnops.c,v 1.32 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: null_vnops.c,v 1.33 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -221,7 +221,7 @@ __KERNEL_RCSID(0, "$NetBSD: null_vnops.c,v 1.32 2005/02/26 22:59:00 perry Exp $" /* * Global vfs data structures */ -int (**null_vnodeop_p) __P((void *)); +int (**null_vnodeop_p)(void *); const struct vnodeopv_entry_desc null_vnodeop_entries[] = { { &vop_default_desc, layer_bypass }, diff --git a/sys/miscfs/overlay/overlay.h b/sys/miscfs/overlay/overlay.h index 6e07a344359b..6f8d2a810ac7 100644 --- a/sys/miscfs/overlay/overlay.h +++ b/sys/miscfs/overlay/overlay.h @@ -1,4 +1,4 @@ -/* $NetBSD: overlay.h,v 1.5 2004/05/20 06:34:30 atatat Exp $ */ +/* $NetBSD: overlay.h,v 1.6 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -114,13 +114,13 @@ struct overlay_node { #define VTOOVERLAY(vp) ((struct overlay_node *)(vp)->v_data) #define OVERLAYTOV(xp) ((xp)->ov_vnode) #ifdef OVERLAYFS_DIAGNOSTIC -extern struct vnode *layer_checkvp __P((struct vnode *vp, char *fil, int lno)); +extern struct vnode *layer_checkvp(struct vnode *vp, char *fil, int lno); #define OVERLAYVPTOLOWERVP(vp) layer_checkvp((vp), __FILE__, __LINE__) #else #define OVERLAYVPTOLOWERVP(vp) (VTOOVERLAY(vp)->ov_lowervp) #endif -extern int (**overlay_vnodeop_p) __P((void *)); +extern int (**overlay_vnodeop_p)(void *); extern struct vfsops overlay_vfsops; #ifdef SYSCTL_SETUP_PROTO diff --git a/sys/miscfs/overlay/overlay_vfsops.c b/sys/miscfs/overlay/overlay_vfsops.c index 49550d183b12..291152c36feb 100644 --- a/sys/miscfs/overlay/overlay_vfsops.c +++ b/sys/miscfs/overlay/overlay_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: overlay_vfsops.c,v 1.30 2005/03/29 02:41:05 thorpej Exp $ */ +/* $NetBSD: overlay_vfsops.c,v 1.31 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999, 2000 National Aeronautics & Space Administration @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.30 2005/03/29 02:41:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.31 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,9 +88,9 @@ __KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.30 2005/03/29 02:41:05 thorpej #include <miscfs/overlay/overlay.h> #include <miscfs/genfs/layer_extern.h> -int ov_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -int ov_unmount __P((struct mount *, int, struct proc *)); +int ov_mount(struct mount *, const char *, void *, + struct nameidata *, struct proc *); +int ov_unmount(struct mount *, int, struct proc *); #define NOVERLAYNODECACHE 16 diff --git a/sys/miscfs/overlay/overlay_vnops.c b/sys/miscfs/overlay/overlay_vnops.c index a69fe158b4f8..edfeba5ebecf 100644 --- a/sys/miscfs/overlay/overlay_vnops.c +++ b/sys/miscfs/overlay/overlay_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: overlay_vnops.c,v 1.14 2004/06/30 17:42:55 hannken Exp $ */ +/* $NetBSD: overlay_vnops.c,v 1.15 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1999, 2000 National Aeronautics & Space Administration @@ -67,7 +67,7 @@ * * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 - * $Id: overlay_vnops.c,v 1.14 2004/06/30 17:42:55 hannken Exp $ + * $Id: overlay_vnops.c,v 1.15 2005/08/30 20:08:01 xtraeme Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project */ @@ -126,7 +126,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: overlay_vnops.c,v 1.14 2004/06/30 17:42:55 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: overlay_vnops.c,v 1.15 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -144,7 +144,7 @@ __KERNEL_RCSID(0, "$NetBSD: overlay_vnops.c,v 1.14 2004/06/30 17:42:55 hannken E /* * Global vfs data structures */ -int (**overlay_vnodeop_p) __P((void *)); +int (**overlay_vnodeop_p)(void *); const struct vnodeopv_entry_desc overlay_vnodeop_entries[] = { { &vop_default_desc, layer_bypass }, diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h index 8280d95dd3a9..4101f1b09a0c 100644 --- a/sys/miscfs/portal/portal.h +++ b/sys/miscfs/portal/portal.h @@ -1,4 +1,4 @@ -/* $NetBSD: portal.h,v 1.9 2004/05/20 06:34:30 atatat Exp $ */ +/* $NetBSD: portal.h,v 1.10 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -65,7 +65,7 @@ struct portalnode { #define PORTAL_ROOTFILEID 2 -extern int (**portal_vnodeop_p) __P((void *)); +extern int (**portal_vnodeop_p)(void *); extern struct vfsops portal_vfsops; #ifdef SYSCTL_SETUP_PROTO diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c index 7d40d0c13c56..322c60975100 100644 --- a/sys/miscfs/portal/portal_vfsops.c +++ b/sys/miscfs/portal/portal_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: portal_vfsops.c,v 1.51 2005/05/29 21:55:34 christos Exp $ */ +/* $NetBSD: portal_vfsops.c,v 1.52 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993, 1995 @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: portal_vfsops.c,v 1.51 2005/05/29 21:55:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: portal_vfsops.c,v 1.52 2005/08/30 20:08:01 xtraeme Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -66,22 +66,22 @@ __KERNEL_RCSID(0, "$NetBSD: portal_vfsops.c,v 1.51 2005/05/29 21:55:34 christos #include <sys/un.h> #include <miscfs/portal/portal.h> -void portal_init __P((void)); -void portal_done __P((void)); -int portal_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -int portal_start __P((struct mount *, int, struct proc *)); -int portal_unmount __P((struct mount *, int, struct proc *)); -int portal_root __P((struct mount *, struct vnode **)); -int portal_quotactl __P((struct mount *, int, uid_t, void *, - struct proc *)); -int portal_statvfs __P((struct mount *, struct statvfs *, struct proc *)); -int portal_sync __P((struct mount *, int, struct ucred *, struct proc *)); -int portal_vget __P((struct mount *, ino_t, struct vnode **)); -int portal_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -int portal_checkexp __P((struct mount *, struct mbuf *, int *, - struct ucred **)); -int portal_vptofh __P((struct vnode *, struct fid *)); +void portal_init(void); +void portal_done(void); +int portal_mount(struct mount *, const char *, void *, + struct nameidata *, struct proc *); +int portal_start(struct mount *, int, struct proc *); +int portal_unmount(struct mount *, int, struct proc *); +int portal_root(struct mount *, struct vnode **); +int portal_quotactl(struct mount *, int, uid_t, void *, + struct proc *); +int portal_statvfs(struct mount *, struct statvfs *, struct proc *); +int portal_sync(struct mount *, int, struct ucred *, struct proc *); +int portal_vget(struct mount *, ino_t, struct vnode **); +int portal_fhtovp(struct mount *, struct fid *, struct vnode **); +int portal_checkexp(struct mount *, struct mbuf *, int *, + struct ucred **); +int portal_vptofh(struct vnode *, struct fid *); void portal_init() diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index 26e21e455e0c..07338efae5b3 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: portal_vnops.c,v 1.59 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: portal_vnops.c,v 1.60 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: portal_vnops.c,v 1.59 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: portal_vnops.c,v 1.60 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,17 +68,17 @@ __KERNEL_RCSID(0, "$NetBSD: portal_vnops.c,v 1.59 2005/02/26 22:59:00 perry Exp static int portal_fileid = PORTAL_ROOTFILEID+1; -static void portal_closefd __P((struct lwp *, int)); -static int portal_connect __P((struct socket *, struct socket *)); +static void portal_closefd(struct lwp *, int); +static int portal_connect(struct socket *, struct socket *); -int portal_lookup __P((void *)); +int portal_lookup(void *); #define portal_create genfs_eopnotsupp #define portal_mknod genfs_eopnotsupp -int portal_open __P((void *)); +int portal_open(void *); #define portal_close genfs_nullop #define portal_access genfs_nullop -int portal_getattr __P((void *)); -int portal_setattr __P((void *)); +int portal_getattr(void *); +int portal_setattr(void *); #define portal_read genfs_eopnotsupp #define portal_write genfs_eopnotsupp #define portal_fcntl genfs_fcntl @@ -88,23 +88,23 @@ int portal_setattr __P((void *)); #define portal_fsync genfs_nullop #define portal_seek genfs_seek #define portal_remove genfs_eopnotsupp -int portal_link __P((void *)); +int portal_link(void *); #define portal_rename genfs_eopnotsupp #define portal_mkdir genfs_eopnotsupp #define portal_rmdir genfs_eopnotsupp -int portal_symlink __P((void *)); -int portal_readdir __P((void *)); +int portal_symlink(void *); +int portal_readdir(void *); #define portal_readlink genfs_eopnotsupp #define portal_abortop genfs_abortop -int portal_inactive __P((void *)); -int portal_reclaim __P((void *)); +int portal_inactive(void *); +int portal_reclaim(void *); #define portal_lock genfs_lock #define portal_unlock genfs_unlock #define portal_bmap genfs_badop #define portal_strategy genfs_badop -int portal_print __P((void *)); +int portal_print(void *); #define portal_islocked genfs_islocked -int portal_pathconf __P((void *)); +int portal_pathconf(void *); #define portal_advlock genfs_badop #define portal_blkatoff genfs_badop #define portal_valloc genfs_eopnotsupp @@ -114,7 +114,7 @@ int portal_pathconf __P((void *)); #define portal_bwrite genfs_eopnotsupp #define portal_putpages genfs_null_putpages -int (**portal_vnodeop_p) __P((void *)); +int (**portal_vnodeop_p)(void *); const struct vnodeopv_entry_desc portal_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, portal_lookup }, /* lookup */ diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h index ed7f776e4343..43d3c102668f 100644 --- a/sys/miscfs/procfs/procfs.h +++ b/sys/miscfs/procfs/procfs.h @@ -1,4 +1,4 @@ -/* $NetBSD: procfs.h,v 1.56 2004/09/20 17:53:08 jdolecek Exp $ */ +/* $NetBSD: procfs.h,v 1.57 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1993 @@ -170,64 +170,64 @@ struct vfs_namemap { int nm_val; }; -int vfs_getuserstr __P((struct uio *, char *, int *)); -const vfs_namemap_t *vfs_findname __P((const vfs_namemap_t *, const char *, int)); +int vfs_getuserstr(struct uio *, char *, int *); +const vfs_namemap_t *vfs_findname(const vfs_namemap_t *, const char *, int); #define PFIND(pid) ((pid) ? pfind(pid) : &proc0) -int procfs_freevp __P((struct vnode *)); -int procfs_allocvp __P((struct mount *, struct vnode **, pid_t, pfstype, int)); -int procfs_donote __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); -int procfs_doregs __P((struct proc *, struct lwp *, struct pfsnode *, - struct uio *)); -int procfs_dofpregs __P((struct proc *, struct lwp *, struct pfsnode *, - struct uio *)); -int procfs_domem __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); -int procfs_doctl __P((struct proc *, struct lwp *, struct pfsnode *, - struct uio *)); -int procfs_do_pid_stat __P((struct proc *, struct lwp *, struct pfsnode *, - struct uio *)); -int procfs_dostatus __P((struct proc *, struct lwp *, struct pfsnode *, - struct uio *)); -int procfs_domap __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *, int)); -int procfs_docmdline __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); -int procfs_domeminfo __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); -int procfs_docpuinfo __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); -int procfs_dofd __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); -int procfs_douptime __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); -int procfs_domounts __P((struct proc *, struct proc *, struct pfsnode *, - struct uio *)); +int procfs_freevp(struct vnode *); +int procfs_allocvp(struct mount *, struct vnode **, pid_t, pfstype, int); +int procfs_donote(struct proc *, struct proc *, struct pfsnode *, + struct uio *); +int procfs_doregs(struct proc *, struct lwp *, struct pfsnode *, + struct uio *); +int procfs_dofpregs(struct proc *, struct lwp *, struct pfsnode *, + struct uio *); +int procfs_domem(struct proc *, struct proc *, struct pfsnode *, + struct uio *); +int procfs_doctl(struct proc *, struct lwp *, struct pfsnode *, + struct uio *); +int procfs_do_pid_stat(struct proc *, struct lwp *, struct pfsnode *, + struct uio *); +int procfs_dostatus(struct proc *, struct lwp *, struct pfsnode *, + struct uio *); +int procfs_domap(struct proc *, struct proc *, struct pfsnode *, + struct uio *, int); +int procfs_docmdline(struct proc *, struct proc *, struct pfsnode *, + struct uio *); +int procfs_domeminfo(struct proc *, struct proc *, struct pfsnode *, + struct uio *); +int procfs_docpuinfo(struct proc *, struct proc *, struct pfsnode *, + struct uio *); +int procfs_dofd(struct proc *, struct proc *, struct pfsnode *, + struct uio *); +int procfs_douptime(struct proc *, struct proc *, struct pfsnode *, + struct uio *); +int procfs_domounts(struct proc *, struct proc *, struct pfsnode *, + struct uio *); -void procfs_revoke_vnodes __P((struct proc *, void *)); -void procfs_hashinit __P((void)); -void procfs_hashreinit __P((void)); -void procfs_hashdone __P((void)); -int procfs_getfp __P((struct pfsnode *, struct proc **, struct file **)); +void procfs_revoke_vnodes(struct proc *, void *); +void procfs_hashinit(void); +void procfs_hashreinit(void); +void procfs_hashdone(void); +int procfs_getfp(struct pfsnode *, struct proc **, struct file **); /* functions to check whether or not files should be displayed */ -int procfs_validfile __P((struct proc *, struct mount *)); -int procfs_validfpregs __P((struct proc *, struct mount *)); -int procfs_validregs __P((struct proc *, struct mount *)); -int procfs_validmap __P((struct proc *, struct mount *)); +int procfs_validfile(struct proc *, struct mount *); +int procfs_validfpregs(struct proc *, struct mount *); +int procfs_validregs(struct proc *, struct mount *); +int procfs_validmap(struct proc *, struct mount *); -int procfs_rw __P((void *)); +int procfs_rw(void *); -int procfs_getcpuinfstr __P((char *, int *)); +int procfs_getcpuinfstr(char *, int *); #define PROCFS_LOCKED 0x01 #define PROCFS_WANT 0x02 -extern int (**procfs_vnodeop_p) __P((void *)); +extern int (**procfs_vnodeop_p)(void *); extern struct vfsops procfs_vfsops; -int procfs_root __P((struct mount *, struct vnode **)); +int procfs_root(struct mount *, struct vnode **); #ifdef __HAVE_PROCFS_MACHDEP struct vattr; diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c index 3ffe74783fc5..04464708bb4b 100644 --- a/sys/miscfs/procfs/procfs_ctl.c +++ b/sys/miscfs/procfs/procfs_ctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_ctl.c,v 1.28 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: procfs_ctl.c,v 1.29 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1993 @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: procfs_ctl.c,v 1.28 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_ctl.c,v 1.29 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,7 +124,7 @@ static const vfs_namemap_t signames[] = { { 0 }, }; -int procfs_control __P((struct proc *, struct lwp *, int, int)); +int procfs_control(struct proc *, struct lwp *, int, int); /* Macros to clear/set/test flags. */ #define SET(t, f) (t) |= (f) diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c index 657e4ebbf02a..199e8d828c8e 100644 --- a/sys/miscfs/procfs/procfs_map.c +++ b/sys/miscfs/procfs/procfs_map.c @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_map.c,v 1.21 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: procfs_map.c,v 1.22 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1993 @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: procfs_map.c,v 1.21 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_map.c,v 1.22 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,8 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_map.c,v 1.21 2005/02/26 22:59:00 perry Exp $" #define MEBUFFERSIZE 256 -extern int getcwd_common __P((struct vnode *, struct vnode *, - char **, char *, int, int, struct proc *)); +extern int getcwd_common(struct vnode *, struct vnode *, + char **, char *, int, int, struct proc *); static int procfs_vnode_to_path(struct vnode *vp, char *path, int len, struct proc *curp, struct proc *p); diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c index 3df45631b732..7641c52d0157 100644 --- a/sys/miscfs/procfs/procfs_subr.c +++ b/sys/miscfs/procfs/procfs_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_subr.c,v 1.64 2005/05/29 21:55:34 christos Exp $ */ +/* $NetBSD: procfs_subr.c,v 1.65 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1993 @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.64 2005/05/29 21:55:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.65 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,9 +88,9 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.64 2005/05/29 21:55:34 christos Ex #include <miscfs/procfs/procfs.h> -void procfs_hashins __P((struct pfsnode *)); -void procfs_hashrem __P((struct pfsnode *)); -struct vnode *procfs_hashget __P((pid_t, pfstype, int, struct mount *)); +void procfs_hashins(struct pfsnode *); +void procfs_hashrem(struct pfsnode *); +struct vnode *procfs_hashget(pid_t, pfstype, int, struct mount *); LIST_HEAD(pfs_hashhead, pfsnode) *pfs_hashtbl; u_long pfs_ihash; /* size of hash table - 1 */ diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c index bed56a159e20..fe3fa4cac0b6 100644 --- a/sys/miscfs/procfs/procfs_vfsops.c +++ b/sys/miscfs/procfs/procfs_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vfsops.c,v 1.60 2005/03/29 02:41:05 thorpej Exp $ */ +/* $NetBSD: procfs_vfsops.c,v 1.61 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1993 @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.60 2005/03/29 02:41:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.61 2005/08/30 20:08:01 xtraeme Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -100,22 +100,22 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.60 2005/03/29 02:41:05 thorpej E #include <uvm/uvm_extern.h> /* for PAGE_SIZE */ -void procfs_init __P((void)); -void procfs_reinit __P((void)); -void procfs_done __P((void)); -int procfs_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -int procfs_start __P((struct mount *, int, struct proc *)); -int procfs_unmount __P((struct mount *, int, struct proc *)); -int procfs_quotactl __P((struct mount *, int, uid_t, void *, - struct proc *)); -int procfs_statvfs __P((struct mount *, struct statvfs *, struct proc *)); -int procfs_sync __P((struct mount *, int, struct ucred *, struct proc *)); -int procfs_vget __P((struct mount *, ino_t, struct vnode **)); -int procfs_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -int procfs_checkexp __P((struct mount *, struct mbuf *, int *, - struct ucred **)); -int procfs_vptofh __P((struct vnode *, struct fid *)); +void procfs_init(void); +void procfs_reinit(void); +void procfs_done(void); +int procfs_mount(struct mount *, const char *, void *, + struct nameidata *, struct proc *); +int procfs_start(struct mount *, int, struct proc *); +int procfs_unmount(struct mount *, int, struct proc *); +int procfs_quotactl(struct mount *, int, uid_t, void *, + struct proc *); +int procfs_statvfs(struct mount *, struct statvfs *, struct proc *); +int procfs_sync(struct mount *, int, struct ucred *, struct proc *); +int procfs_vget(struct mount *, ino_t, struct vnode **); +int procfs_fhtovp(struct mount *, struct fid *, struct vnode **); +int procfs_checkexp(struct mount *, struct mbuf *, int *, + struct ucred **); +int procfs_vptofh(struct vnode *, struct fid *); /* * VFS Operations. diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index c84ca481f847..96e00a8cc582 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vnops.c,v 1.123 2005/05/29 21:55:34 christos Exp $ */ +/* $NetBSD: procfs_vnops.c,v 1.124 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1993, 1995 @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.123 2005/05/29 21:55:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.124 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -106,7 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.123 2005/05/29 21:55:34 christos * */ -static int procfs_validfile_linux __P((struct proc *, struct mount *)); +static int procfs_validfile_linux(struct proc *, struct mount *); static int procfs_root_readdir_callback(struct proc *, void *); /* @@ -119,7 +119,7 @@ static const struct proc_target { u_char pt_namlen; const char *pt_name; pfstype pt_pfstype; - int (*pt_valid) __P((struct proc *, struct mount *)); + int (*pt_valid)(struct proc *, struct mount *); } proc_targets[] = { #define N(s) sizeof(s)-1, s /* name type validp */ @@ -162,14 +162,14 @@ static const struct proc_target proc_root_targets[] = { static const int nproc_root_targets = sizeof(proc_root_targets) / sizeof(proc_root_targets[0]); -int procfs_lookup __P((void *)); +int procfs_lookup(void *); #define procfs_create genfs_eopnotsupp #define procfs_mknod genfs_eopnotsupp -int procfs_open __P((void *)); -int procfs_close __P((void *)); -int procfs_access __P((void *)); -int procfs_getattr __P((void *)); -int procfs_setattr __P((void *)); +int procfs_open(void *); +int procfs_close(void *); +int procfs_access(void *); +int procfs_getattr(void *); +int procfs_setattr(void *); #define procfs_read procfs_rw #define procfs_write procfs_rw #define procfs_fcntl genfs_fcntl @@ -179,22 +179,22 @@ int procfs_setattr __P((void *)); #define procfs_fsync genfs_nullop #define procfs_seek genfs_nullop #define procfs_remove genfs_eopnotsupp -int procfs_link __P((void *)); +int procfs_link(void *); #define procfs_rename genfs_eopnotsupp #define procfs_mkdir genfs_eopnotsupp #define procfs_rmdir genfs_eopnotsupp -int procfs_symlink __P((void *)); -int procfs_readdir __P((void *)); -int procfs_readlink __P((void *)); +int procfs_symlink(void *); +int procfs_readdir(void *); +int procfs_readlink(void *); #define procfs_abortop genfs_abortop -int procfs_inactive __P((void *)); -int procfs_reclaim __P((void *)); +int procfs_inactive(void *); +int procfs_reclaim(void *); #define procfs_lock genfs_lock #define procfs_unlock genfs_unlock #define procfs_bmap genfs_badop #define procfs_strategy genfs_badop -int procfs_print __P((void *)); -int procfs_pathconf __P((void *)); +int procfs_print(void *); +int procfs_pathconf(void *); #define procfs_islocked genfs_islocked #define procfs_advlock genfs_einval #define procfs_blkatoff genfs_eopnotsupp @@ -205,12 +205,12 @@ int procfs_pathconf __P((void *)); #define procfs_bwrite genfs_eopnotsupp #define procfs_putpages genfs_null_putpages -static int atoi __P((const char *, size_t)); +static int atoi(const char *, size_t); /* * procfs vnode operations. */ -int (**procfs_vnodeop_p) __P((void *)); +int (**procfs_vnodeop_p)(void *); const struct vnodeopv_entry_desc procfs_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, procfs_lookup }, /* lookup */ diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index ef177ea60da2..d4fa43947e03 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: spec_vnops.c,v 1.81 2005/06/21 14:01:13 ws Exp $ */ +/* $NetBSD: spec_vnops.c,v 1.82 2005/08/30 20:08:01 xtraeme Exp $ */ /* * Copyright (c) 1989, 1993 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.81 2005/06/21 14:01:13 ws Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.82 2005/08/30 20:08:01 xtraeme Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -76,7 +76,7 @@ struct vnode *speclisth[SPECHSZ]; * equivalent for other filesystems. */ -int (**spec_vnodeop_p) __P((void *)); +int (**spec_vnodeop_p)(void *); const struct vnodeopv_entry_desc spec_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, spec_lookup }, /* lookup */ @@ -680,7 +680,7 @@ spec_close(v) const struct cdevsw *cdev; struct session *sess; dev_t dev = vp->v_rdev; - int (*devclose) __P((dev_t, int, int, struct proc *)); + int (*devclose)(dev_t, int, int, struct proc *); int mode, error, count, flags, flags1; count = vcount(vp); diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h index ae79a6a3afbe..f78b36e19395 100644 --- a/sys/miscfs/specfs/specdev.h +++ b/sys/miscfs/specfs/specdev.h @@ -1,4 +1,4 @@ -/* $NetBSD: specdev.h,v 1.26 2004/05/25 14:54:58 hannken Exp $ */ +/* $NetBSD: specdev.h,v 1.27 2005/08/30 20:08:02 xtraeme Exp $ */ /* * Copyright (c) 1990, 1993 @@ -95,7 +95,7 @@ extern struct vnode *speclisth[SPECHSZ]; /* * Prototypes for special file operations on vnodes. */ -extern int (**spec_vnodeop_p) __P((void *)); +extern int (**spec_vnodeop_p)(void *); struct nameidata; struct componentname; struct ucred; @@ -103,24 +103,24 @@ struct flock; struct buf; struct uio; -int spec_lookup __P((void *)); +int spec_lookup(void *); #define spec_create genfs_badop #define spec_mknod genfs_badop -int spec_open __P((void *)); -int spec_close __P((void *)); +int spec_open(void *); +int spec_close(void *); #define spec_access genfs_ebadf #define spec_getattr genfs_ebadf #define spec_setattr genfs_ebadf -int spec_read __P((void *)); -int spec_write __P((void *)); +int spec_read(void *); +int spec_write(void *); #define spec_lease_check genfs_nullop #define spec_fcntl genfs_fcntl -int spec_ioctl __P((void *)); -int spec_poll __P((void *)); -int spec_kqfilter __P((void *)); +int spec_ioctl(void *); +int spec_poll(void *); +int spec_kqfilter(void *); #define spec_revoke genfs_revoke #define spec_mmap genfs_mmap -int spec_fsync __P((void *)); +int spec_fsync(void *); #define spec_seek genfs_nullop /* XXX should query device */ #define spec_remove genfs_badop #define spec_link genfs_badop @@ -132,15 +132,15 @@ int spec_fsync __P((void *)); #define spec_readlink genfs_badop #define spec_abortop genfs_badop #define spec_reclaim genfs_nullop -int spec_inactive __P((void *)); +int spec_inactive(void *); #define spec_lock genfs_nolock #define spec_unlock genfs_nounlock -int spec_bmap __P((void *)); -int spec_strategy __P((void *)); -int spec_print __P((void *)); +int spec_bmap(void *); +int spec_strategy(void *); +int spec_print(void *); #define spec_islocked genfs_noislocked -int spec_pathconf __P((void *)); -int spec_advlock __P((void *)); +int spec_pathconf(void *); +int spec_advlock(void *); #define spec_blkatoff genfs_badop #define spec_valloc genfs_badop #define spec_reallocblks genfs_badop @@ -150,6 +150,6 @@ int spec_advlock __P((void *)); #define spec_bwrite vn_bwrite #define spec_getpages genfs_getpages #define spec_putpages genfs_putpages -int spec_size __P((void *)); +int spec_size(void *); #endif /* _MISCFS_SPECFS_SPECDEV_H_ */ diff --git a/sys/miscfs/syncfs/sync_vnops.c b/sys/miscfs/syncfs/sync_vnops.c index ef43e51a7474..ad2a40018371 100644 --- a/sys/miscfs/syncfs/sync_vnops.c +++ b/sys/miscfs/syncfs/sync_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: sync_vnops.c,v 1.11 2003/10/15 11:29:01 hannken Exp $ */ +/* $NetBSD: sync_vnops.c,v 1.12 2005/08/30 20:08:02 xtraeme Exp $ */ /* * Copyright 1997 Marshall Kirk McKusick. All Rights Reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sync_vnops.c,v 1.11 2003/10/15 11:29:01 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sync_vnops.c,v 1.12 2005/08/30 20:08:02 xtraeme Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: sync_vnops.c,v 1.11 2003/10/15 11:29:01 hannken Exp #include <miscfs/genfs/genfs.h> #include <miscfs/syncfs/syncfs.h> -int (**sync_vnodeop_p) __P((void *)); +int (**sync_vnodeop_p)(void *); const struct vnodeopv_entry_desc sync_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_close_desc, sync_close }, /* close */ diff --git a/sys/miscfs/syncfs/syncfs.h b/sys/miscfs/syncfs/syncfs.h index cdb66ee51ec2..0fcf7218b586 100644 --- a/sys/miscfs/syncfs/syncfs.h +++ b/sys/miscfs/syncfs/syncfs.h @@ -1,4 +1,4 @@ -/* $NetBSD: syncfs.h,v 1.7 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: syncfs.h,v 1.8 2005/08/30 20:08:02 xtraeme Exp $ */ /* * Copyright 1997 Marshall Kirk McKusick. All Rights Reserved. @@ -38,21 +38,21 @@ * Routines to create and manage a filesystem syncer vnode. */ #define sync_close genfs_nullop -int sync_fsync __P((void *)); -int sync_inactive __P((void *)); -int sync_reclaim __P((void *)); +int sync_fsync(void *); +int sync_inactive(void *); +int sync_reclaim(void *); #define sync_lock genfs_nolock #define sync_unlock genfs_nounlock -int sync_print __P((void *)); +int sync_print(void *); #define sync_islocked genfs_noislocked #define sync_putpages genfs_null_putpages -void sched_sync __P((void *)); -void vn_initialize_syncerd __P((void)); -int vfs_allocate_syncvnode __P((struct mount *)); -void vfs_deallocate_syncvnode __P((struct mount *)); +void sched_sync(void *); +void vn_initialize_syncerd(void); +int vfs_allocate_syncvnode(struct mount *); +void vfs_deallocate_syncvnode(struct mount *); -extern int (**sync_vnodeop_p) __P((void *)); +extern int (**sync_vnodeop_p)(void *); #define SYNCER_MAXDELAY 32 diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h index a5104fe0cbf5..5494002f672d 100644 --- a/sys/miscfs/umapfs/umap.h +++ b/sys/miscfs/umapfs/umap.h @@ -1,4 +1,4 @@ -/* $NetBSD: umap.h,v 1.12 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: umap.h,v 1.13 2005/08/30 20:08:02 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -84,8 +84,8 @@ struct umap_node { struct layer_node ln; }; -u_long umap_reverse_findid __P((u_long id, u_long map[][2], int nentries)); -void umap_mapids __P((struct mount *v_mount, struct ucred *credp)); +u_long umap_reverse_findid(u_long id, u_long map[][2], int nentries); +void umap_mapids(struct mount *v_mount, struct ucred *credp); #define umap_hash ln.layer_hash #define umap_lowervp ln.layer_lowervp @@ -101,10 +101,10 @@ void umap_mapids __P((struct mount *v_mount, struct ucred *credp)); #define UMAPVPTOLOWERVP(vp) (VTOUMAP(vp)->umap_lowervp) #endif -extern int (**umap_vnodeop_p) __P((void *)); +extern int (**umap_vnodeop_p)(void *); extern struct vfsops umapfs_vfsops; -int umap_bypass __P((void *)); +int umap_bypass(void *); #define NUMAPNODECACHE 16 diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c index d54332f82631..5e559632cddc 100644 --- a/sys/miscfs/umapfs/umap_subr.c +++ b/sys/miscfs/umapfs/umap_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: umap_subr.c,v 1.21 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: umap_subr.c,v 1.22 2005/08/30 20:08:02 xtraeme Exp $ */ /* * Copyright (c) 1999 National Aeronautics & Space Administration @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umap_subr.c,v 1.21 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umap_subr.c,v 1.22 2005/08/30 20:08:02 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,9 +81,9 @@ __KERNEL_RCSID(0, "$NetBSD: umap_subr.c,v 1.21 2005/02/26 22:59:00 perry Exp $") #include <miscfs/specfs/specdev.h> #include <miscfs/umapfs/umap.h> -u_long umap_findid __P((u_long, u_long [][2], int)); -int umap_node_alloc __P((struct mount *, struct vnode *, - struct vnode **)); +u_long umap_findid(u_long, u_long [][2], int); +int umap_node_alloc(struct mount *, struct vnode *, + struct vnode **); /* * umap_findid is called by various routines in umap_vnodeops.c to diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index 7e286b6b9efa..eaab2c5861ef 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: umap_vfsops.c,v 1.53 2005/05/29 21:55:34 christos Exp $ */ +/* $NetBSD: umap_vfsops.c,v 1.54 2005/08/30 20:08:02 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.53 2005/05/29 21:55:34 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.54 2005/08/30 20:08:02 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,9 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.53 2005/05/29 21:55:34 christos Ex #include <miscfs/umapfs/umap.h> #include <miscfs/genfs/layer_extern.h> -int umapfs_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -int umapfs_unmount __P((struct mount *, int, struct proc *)); +int umapfs_mount(struct mount *, const char *, void *, + struct nameidata *, struct proc *); +int umapfs_unmount(struct mount *, int, struct proc *); /* * Mount umap layer diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index b4c3a0c90014..5a669fe87ba8 100644 --- a/sys/miscfs/umapfs/umap_vnops.c +++ b/sys/miscfs/umapfs/umap_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: umap_vnops.c,v 1.33 2005/02/26 22:59:00 perry Exp $ */ +/* $NetBSD: umap_vnops.c,v 1.34 2005/08/30 20:08:02 xtraeme Exp $ */ /* * Copyright (c) 1992, 1993 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.33 2005/02/26 22:59:00 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.34 2005/08/30 20:08:02 xtraeme Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -53,10 +53,10 @@ __KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.33 2005/02/26 22:59:00 perry Exp $" #include <miscfs/genfs/genfs.h> #include <miscfs/genfs/layer_extern.h> -int umap_lookup __P((void *)); -int umap_getattr __P((void *)); -int umap_print __P((void *)); -int umap_rename __P((void *)); +int umap_lookup(void *); +int umap_getattr(void *); +int umap_print(void *); +int umap_rename(void *); /* * Global vfs data structures @@ -66,7 +66,7 @@ int umap_rename __P((void *)); * go away with a merged buffer/block cache. * */ -int (**umap_vnodeop_p) __P((void *)); +int (**umap_vnodeop_p)(void *); const struct vnodeopv_entry_desc umap_vnodeop_entries[] = { { &vop_default_desc, umap_bypass }, @@ -109,7 +109,7 @@ umap_bypass(v) struct vnodeop_desc *a_desc; <other random data follows, presumably> } */ *ap = v; - int (**our_vnodeop_p) __P((void *)); + int (**our_vnodeop_p)(void *); struct ucred **credpp = 0, *credp = 0; struct ucred *savecredp = 0, *savecompcredp = 0; struct ucred *compcredp = 0;