diff options
61 files changed, 672 insertions, 682 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 * diff --git a/sys/posix4/aio.h b/sys/posix4/aio.h index 32705f9..093eb0b 100644 --- a/sys/posix4/aio.h +++ b/sys/posix4/aio.h @@ -91,18 +91,18 @@ struct aiocb { #include <sys/cdefs.h> __BEGIN_DECLS -int aio_read __P((struct aiocb *)); -int aio_write __P((struct aiocb *)); +int aio_read(struct aiocb *); +int aio_write(struct aiocb *); -int lio_listio __P((int, aio_listio_ctl[], int, struct sigevent *)); +int lio_listio(int, aio_listio_ctl[], int, struct sigevent *); -int aio_error __P((const struct aiocb *)); -ssize_t aio_return __P((struct aiocb *)); -int aio_cancel __P((int, struct aiocb *)); +int aio_error(const struct aiocb *); +ssize_t aio_return(struct aiocb *); +int aio_cancel(int, struct aiocb *); -int aio_suspend __P((caio_listio_ctl[], int, const struct timespec *)); +int aio_suspend(caio_listio_ctl[], int, const struct timespec *); -int aio_fsync __P((int, struct aiocb *)); +int aio_fsync(int, struct aiocb *); __END_DECLS #endif /* _KERNEL */ diff --git a/sys/posix4/mqueue.h b/sys/posix4/mqueue.h index c2fc38e..803c5b4 100644 --- a/sys/posix4/mqueue.h +++ b/sys/posix4/mqueue.h @@ -62,14 +62,14 @@ struct mq_attr { #include <sys/cdefs.h> __BEGIN_DECLS -mqd_t mq_open __P((const char *, int oflag, ...)); -int mq_close __P((mqd_t)); -int mq_unlink __P((const char *)); -int mq_send __P((mqd_t, const char *, size_t, unsigned int)); -ssize_t mq_receive __P((mqd_t, char *, size_t, unsigned int *)); -int mq_notify __P((mqd_t, const struct sigevent *)); -int mq_setattr __P((mqd_t, const struct mq_attr *, struct mq_attr *)); -int mq_getattr __P((mqd_t, struct mq_attr *)); +mqd_t mq_open(const char *, int oflag, ...); +int mq_close(mqd_t); +int mq_unlink(const char *); +int mq_send(mqd_t, const char *, size_t, unsigned int); +ssize_t mq_receive(mqd_t, char *, size_t, unsigned int *); +int mq_notify(mqd_t, const struct sigevent *); +int mq_setattr(mqd_t, const struct mq_attr *, struct mq_attr *); +int mq_getattr(mqd_t, struct mq_attr *); __END_DECLS #endif diff --git a/sys/posix4/posix4.h b/sys/posix4/posix4.h index 626d6d8..9b3c66e 100644 --- a/sys/posix4/posix4.h +++ b/sys/posix4/posix4.h @@ -61,9 +61,9 @@ MALLOC_DECLARE(M_P31B); #define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK) #define p31b_free(P) free((P), M_P31B) -int p31b_proc __P((struct proc *, pid_t, struct proc **)); +int p31b_proc(struct proc *, pid_t, struct proc **); -void p31b_setcfg __P((int, int)); +void p31b_setcfg(int, int); #ifdef _KPOSIX_PRIORITY_SCHEDULING diff --git a/sys/posix4/sched.h b/sys/posix4/sched.h index bdfc49b..6ac2c8c 100644 --- a/sys/posix4/sched.h +++ b/sys/posix4/sched.h @@ -59,16 +59,16 @@ struct sched_param #include <sys/cdefs.h> __BEGIN_DECLS -int sched_setparam __P((pid_t, const struct sched_param *)); -int sched_getparam __P((pid_t, struct sched_param *)); +int sched_setparam(pid_t, const struct sched_param *); +int sched_getparam(pid_t, struct sched_param *); -int sched_setscheduler __P((pid_t, int, const struct sched_param *)); -int sched_getscheduler __P((pid_t)); +int sched_setscheduler(pid_t, int, const struct sched_param *); +int sched_getscheduler(pid_t); -int sched_yield __P((void)); -int sched_get_priority_max __P((int)); -int sched_get_priority_min __P((int)); -int sched_rr_get_interval __P((pid_t, struct timespec *)); +int sched_yield(void); +int sched_get_priority_max(int); +int sched_get_priority_min(int); +int sched_rr_get_interval(pid_t, struct timespec *); __END_DECLS #endif diff --git a/sys/posix4/semaphore.h b/sys/posix4/semaphore.h index 9741b06..b404a03 100644 --- a/sys/posix4/semaphore.h +++ b/sys/posix4/semaphore.h @@ -56,15 +56,15 @@ typedef struct sem *sem_t; #include <sys/cdefs.h> __BEGIN_DECLS -int sem_init __P((sem_t *, int, unsigned int)); -int sem_destroy __P((sem_t *)); -sem_t *sem_open __P((const char *, int, ...)); -int sem_close __P((sem_t *)); -int sem_unlink __P((const char *)); -int sem_wait __P((sem_t *)); -int sem_trywait __P((sem_t *)); -int sem_post __P((sem_t *)); -int sem_getvalue __P((sem_t *, int *)); +int sem_init(sem_t *, int, unsigned int); +int sem_destroy(sem_t *); +sem_t *sem_open(const char *, int, ...); +int sem_close(sem_t *); +int sem_unlink(const char *); +int sem_wait(sem_t *); +int sem_trywait(sem_t *); +int sem_post(sem_t *); +int sem_getvalue(sem_t *, int *); __END_DECLS #endif diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h index 626d6d8..9b3c66e 100644 --- a/sys/sys/posix4.h +++ b/sys/sys/posix4.h @@ -61,9 +61,9 @@ MALLOC_DECLARE(M_P31B); #define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK) #define p31b_free(P) free((P), M_P31B) -int p31b_proc __P((struct proc *, pid_t, struct proc **)); +int p31b_proc(struct proc *, pid_t, struct proc **); -void p31b_setcfg __P((int, int)); +void p31b_setcfg(int, int); #ifdef _KPOSIX_PRIORITY_SCHEDULING diff --git a/sys/sys/semaphore.h b/sys/sys/semaphore.h index 9741b06..b404a03 100644 --- a/sys/sys/semaphore.h +++ b/sys/sys/semaphore.h @@ -56,15 +56,15 @@ typedef struct sem *sem_t; #include <sys/cdefs.h> __BEGIN_DECLS -int sem_init __P((sem_t *, int, unsigned int)); -int sem_destroy __P((sem_t *)); -sem_t *sem_open __P((const char *, int, ...)); -int sem_close __P((sem_t *)); -int sem_unlink __P((const char *)); -int sem_wait __P((sem_t *)); -int sem_trywait __P((sem_t *)); -int sem_post __P((sem_t *)); -int sem_getvalue __P((sem_t *, int *)); +int sem_init(sem_t *, int, unsigned int); +int sem_destroy(sem_t *); +sem_t *sem_open(const char *, int, ...); +int sem_close(sem_t *); +int sem_unlink(const char *); +int sem_wait(sem_t *); +int sem_trywait(sem_t *); +int sem_post(sem_t *); +int sem_getvalue(sem_t *, int *); __END_DECLS #endif diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index 305c011..c3854ab 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -52,14 +52,14 @@ #include <vm/vm_zone.h> #include <vm/swap_pager.h> -static vm_object_t default_pager_alloc __P((void *, vm_ooffset_t, vm_prot_t, - vm_ooffset_t)); -static void default_pager_dealloc __P((vm_object_t)); -static int default_pager_getpages __P((vm_object_t, vm_page_t *, int, int)); -static void default_pager_putpages __P((vm_object_t, vm_page_t *, int, - boolean_t, int *)); -static boolean_t default_pager_haspage __P((vm_object_t, vm_pindex_t, int *, - int *)); +static vm_object_t default_pager_alloc(void *, vm_ooffset_t, vm_prot_t, + vm_ooffset_t); +static void default_pager_dealloc(vm_object_t); +static int default_pager_getpages(vm_object_t, vm_page_t *, int, int); +static void default_pager_putpages(vm_object_t, vm_page_t *, int, + boolean_t, int *); +static boolean_t default_pager_haspage(vm_object_t, vm_pindex_t, int *, + int *); /* * pagerops for OBJT_DEFAULT - "default pager". */ diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index bf6b3d9..e4e5591 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -54,15 +54,15 @@ #include <vm/vm_pager.h> #include <vm/vm_zone.h> -static void dev_pager_init __P((void)); -static vm_object_t dev_pager_alloc __P((void *, vm_ooffset_t, vm_prot_t, - vm_ooffset_t)); -static void dev_pager_dealloc __P((vm_object_t)); -static int dev_pager_getpages __P((vm_object_t, vm_page_t *, int, int)); -static void dev_pager_putpages __P((vm_object_t, vm_page_t *, int, - boolean_t, int *)); -static boolean_t dev_pager_haspage __P((vm_object_t, vm_pindex_t, int *, - int *)); +static void dev_pager_init(void); +static vm_object_t dev_pager_alloc(void *, vm_ooffset_t, vm_prot_t, + vm_ooffset_t); +static void dev_pager_dealloc(vm_object_t); +static int dev_pager_getpages(vm_object_t, vm_page_t *, int, int); +static void dev_pager_putpages(vm_object_t, vm_page_t *, int, + boolean_t, int *); +static boolean_t dev_pager_haspage(vm_object_t, vm_pindex_t, int *, + int *); /* list of device pager objects */ static struct pagerlst dev_pager_object_list; @@ -77,8 +77,8 @@ static vm_zone_t fakepg_zone; static struct vm_zone fakepg_zone_store; #endif -static vm_page_t dev_pager_getfake __P((vm_offset_t)); -static void dev_pager_putfake __P((vm_page_t)); +static vm_page_t dev_pager_getfake(vm_offset_t); +static void dev_pager_putfake(vm_page_t); struct pagerops devicepagerops = { dev_pager_init, diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index 9c91d3e..4edb3da 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -90,60 +90,57 @@ struct proc; struct thread; #ifdef __alpha__ -void pmap_page_is_free __P((vm_page_t m)); +void pmap_page_is_free(vm_page_t m); #endif -void pmap_change_wiring __P((pmap_t, vm_offset_t, boolean_t)); -void pmap_clear_modify __P((vm_page_t m)); -void pmap_clear_reference __P((vm_page_t m)); -void pmap_collect __P((void)); -void pmap_copy __P((pmap_t, pmap_t, vm_offset_t, vm_size_t, - vm_offset_t)); -void pmap_copy_page __P((vm_offset_t, vm_offset_t)); -void pmap_destroy __P((pmap_t)); -void pmap_enter __P((pmap_t, vm_offset_t, vm_page_t, vm_prot_t, - boolean_t)); -vm_offset_t pmap_extract __P((pmap_t pmap, vm_offset_t va)); -void pmap_growkernel __P((vm_offset_t)); -void pmap_init __P((vm_offset_t, vm_offset_t)); -boolean_t pmap_is_modified __P((vm_page_t m)); -boolean_t pmap_ts_referenced __P((vm_page_t m)); -void pmap_kenter __P((vm_offset_t va, vm_offset_t pa)); -void pmap_kremove __P((vm_offset_t)); -vm_offset_t pmap_map __P((vm_offset_t *, vm_offset_t, vm_offset_t, int)); -void pmap_object_init_pt __P((pmap_t pmap, vm_offset_t addr, +void pmap_change_wiring(pmap_t, vm_offset_t, boolean_t); +void pmap_clear_modify(vm_page_t m); +void pmap_clear_reference(vm_page_t m); +void pmap_collect(void); +void pmap_copy(pmap_t, pmap_t, vm_offset_t, vm_size_t, vm_offset_t); +void pmap_copy_page(vm_offset_t, vm_offset_t); +void pmap_destroy(pmap_t); +void pmap_enter(pmap_t, vm_offset_t, vm_page_t, vm_prot_t, + boolean_t); +vm_offset_t pmap_extract(pmap_t pmap, vm_offset_t va); +void pmap_growkernel(vm_offset_t); +void pmap_init(vm_offset_t, vm_offset_t); +boolean_t pmap_is_modified(vm_page_t m); +boolean_t pmap_ts_referenced(vm_page_t m); +void pmap_kenter(vm_offset_t va, vm_offset_t pa); +void pmap_kremove(vm_offset_t); +vm_offset_t pmap_map(vm_offset_t *, vm_offset_t, vm_offset_t, int); +void pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_offset_t size, - int pagelimit)); -boolean_t pmap_page_exists_quick __P((pmap_t pmap, vm_page_t m)); -void pmap_page_protect __P((vm_page_t m, vm_prot_t prot)); -void pmap_pageable __P((pmap_t, vm_offset_t, vm_offset_t, - boolean_t)); -vm_offset_t pmap_phys_address __P((int)); -void pmap_pinit __P((pmap_t)); -void pmap_pinit0 __P((pmap_t)); -void pmap_pinit2 __P((pmap_t)); -void pmap_protect __P((pmap_t, vm_offset_t, vm_offset_t, - vm_prot_t)); -void pmap_qenter __P((vm_offset_t, vm_page_t *, int)); -void pmap_qremove __P((vm_offset_t, int)); -void pmap_reference __P((pmap_t)); -void pmap_release __P((pmap_t)); -void pmap_remove __P((pmap_t, vm_offset_t, vm_offset_t)); -void pmap_remove_pages __P((pmap_t, vm_offset_t, vm_offset_t)); -void pmap_zero_page __P((vm_offset_t)); -void pmap_zero_page_area __P((vm_offset_t, int off, int size)); -void pmap_prefault __P((pmap_t, vm_offset_t, vm_map_entry_t)); -int pmap_mincore __P((pmap_t pmap, vm_offset_t addr)); -void pmap_new_proc __P((struct proc *p)); -void pmap_dispose_proc __P((struct proc *p)); -void pmap_swapout_proc __P((struct proc *p)); -void pmap_swapin_proc __P((struct proc *p)); -void pmap_new_thread __P((struct thread *td)); -void pmap_dispose_thread __P((struct thread *td)); -void pmap_swapout_thread __P((struct thread *td)); -void pmap_swapin_thread __P((struct thread *td)); -void pmap_activate __P((struct thread *td)); -vm_offset_t pmap_addr_hint __P((vm_object_t obj, vm_offset_t addr, vm_size_t size)); -void *pmap_kenter_temporary __P((vm_offset_t pa, int i)); -void pmap_init2 __P((void)); + int pagelimit); +boolean_t pmap_page_exists_quick(pmap_t pmap, vm_page_t m); +void pmap_page_protect(vm_page_t m, vm_prot_t prot); +void pmap_pageable(pmap_t, vm_offset_t, vm_offset_t, boolean_t); +vm_offset_t pmap_phys_address(int); +void pmap_pinit(pmap_t); +void pmap_pinit0(pmap_t); +void pmap_pinit2(pmap_t); +void pmap_protect(pmap_t, vm_offset_t, vm_offset_t, vm_prot_t); +void pmap_qenter(vm_offset_t, vm_page_t *, int); +void pmap_qremove(vm_offset_t, int); +void pmap_reference(pmap_t); +void pmap_release(pmap_t); +void pmap_remove(pmap_t, vm_offset_t, vm_offset_t); +void pmap_remove_pages(pmap_t, vm_offset_t, vm_offset_t); +void pmap_zero_page(vm_offset_t); +void pmap_zero_page_area(vm_offset_t, int off, int size); +void pmap_prefault(pmap_t, vm_offset_t, vm_map_entry_t); +int pmap_mincore(pmap_t pmap, vm_offset_t addr); +void pmap_new_proc(struct proc *p); +void pmap_dispose_proc(struct proc *p); +void pmap_swapout_proc(struct proc *p); +void pmap_swapin_proc(struct proc *p); +void pmap_new_thread(struct thread *td); +void pmap_dispose_thread(struct thread *td); +void pmap_swapout_thread(struct thread *td); +void pmap_swapin_thread(struct thread *td); +void pmap_activate(struct thread *td); +vm_offset_t pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size); +void *pmap_kenter_temporary(vm_offset_t pa, int i); +void pmap_init2(void); #endif /* _KERNEL */ #endif /* _PMAP_VM_ */ diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 7b9c49a..a6552d9 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -156,13 +156,13 @@ vm_zone_t swap_zone; * (see vm/swap_pager.h). */ static vm_object_t - swap_pager_alloc __P((void *handle, vm_ooffset_t size, - vm_prot_t prot, vm_ooffset_t offset)); -static void swap_pager_dealloc __P((vm_object_t object)); -static int swap_pager_getpages __P((vm_object_t, vm_page_t *, int, int)); -static void swap_pager_init __P((void)); -static void swap_pager_unswapped __P((vm_page_t)); -static void swap_pager_strategy __P((vm_object_t, struct bio *)); + swap_pager_alloc(void *handle, vm_ooffset_t size, + vm_prot_t prot, vm_ooffset_t offset); +static void swap_pager_dealloc(vm_object_t object); +static int swap_pager_getpages(vm_object_t, vm_page_t *, int, int); +static void swap_pager_init(void); +static void swap_pager_unswapped(vm_page_t); +static void swap_pager_strategy(vm_object_t, struct bio *); struct pagerops swappagerops = { swap_pager_init, /* early system initialization of pager */ @@ -194,23 +194,23 @@ int nswap_hiwat = 512; /* in pages, swap_pager_almost_full warn */ SYSCTL_INT(_vm, OID_AUTO, dmmax, CTLFLAG_RD, &dmmax, 0, "Maximum size of a swap block"); -static __inline void swp_sizecheck __P((void)); -static void swp_pager_sync_iodone __P((struct buf *bp)); -static void swp_pager_async_iodone __P((struct buf *bp)); +static __inline void swp_sizecheck(void); +static void swp_pager_sync_iodone(struct buf *bp); +static void swp_pager_async_iodone(struct buf *bp); /* * Swap bitmap functions */ -static __inline void swp_pager_freeswapspace __P((daddr_t blk, int npages)); -static __inline daddr_t swp_pager_getswapspace __P((int npages)); +static __inline void swp_pager_freeswapspace(daddr_t blk, int npages); +static __inline daddr_t swp_pager_getswapspace(int npages); /* * Metadata functions */ -static void swp_pager_meta_build __P((vm_object_t, vm_pindex_t, daddr_t)); -static void swp_pager_meta_free __P((vm_object_t, vm_pindex_t, daddr_t)); -static void swp_pager_meta_free_all __P((vm_object_t)); -static daddr_t swp_pager_meta_ctl __P((vm_object_t, vm_pindex_t, int)); +static void swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t); +static void swp_pager_meta_free(vm_object_t, vm_pindex_t, daddr_t); +static void swp_pager_meta_free_all(vm_object_t); +static daddr_t swp_pager_meta_ctl(vm_object_t, vm_pindex_t, int); /* * SWP_SIZECHECK() - update swap_pager_full indication diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h index c71eb98..b028ecb 100644 --- a/sys/vm/swap_pager.h +++ b/sys/vm/swap_pager.h @@ -84,25 +84,25 @@ extern int swap_pager_full; extern struct blist *swapblist; extern vm_zone_t swap_zone; -void swap_pager_putpages __P((vm_object_t, vm_page_t *, int, boolean_t, int *)); -boolean_t swap_pager_haspage __P((vm_object_t object, vm_pindex_t pindex, int *before, int *after)); +void swap_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); +boolean_t swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, int *after); -int swap_pager_swp_alloc __P((vm_object_t, int)); -void swap_pager_copy __P((vm_object_t, vm_object_t, vm_pindex_t, int)); -void swap_pager_freespace __P((vm_object_t, vm_pindex_t, vm_size_t)); -void swap_pager_dmzspace __P((vm_object_t, vm_pindex_t, vm_size_t)); -void swap_pager_swap_init __P((void)); -int swap_pager_reserve __P((vm_object_t, vm_pindex_t, vm_size_t)); +int swap_pager_swp_alloc(vm_object_t, int); +void swap_pager_copy(vm_object_t, vm_object_t, vm_pindex_t, int); +void swap_pager_freespace(vm_object_t, vm_pindex_t, vm_size_t); +void swap_pager_dmzspace(vm_object_t, vm_pindex_t, vm_size_t); +void swap_pager_swap_init(void); +int swap_pager_reserve(vm_object_t, vm_pindex_t, vm_size_t); /* * newswap functions */ -void swap_pager_page_removed __P((vm_page_t, vm_object_t)); +void swap_pager_page_removed(vm_page_t, vm_object_t); /* choose underlying swap device and queue up I/O */ struct buf; -void swstrategy __P((struct buf *bp)); /* probably needs to move elsewhere */ +void swstrategy(struct buf *bp); /* probably needs to move elsewhere */ #endif /* _KERNEL */ #endif /* _SWAP_PAGER_ */ diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 0f5f92d..cfe8fac 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -47,55 +47,55 @@ struct vnode; #ifdef _KERNEL #ifdef TYPEDEF_FOR_UAP -int getpagesize __P((struct thread *, void *, int *)); -int madvise __P((struct thread *, void *, int *)); -int mincore __P((struct thread *, void *, int *)); -int mprotect __P((struct thread *, void *, int *)); -int msync __P((struct thread *, void *, int *)); -int munmap __P((struct thread *, void *, int *)); -int obreak __P((struct thread *, void *, int *)); -int sbrk __P((struct thread *, void *, int *)); -int sstk __P((struct thread *, void *, int *)); -int swapon __P((struct thread *, void *, int *)); +int getpagesize(struct thread *, void *, int *); +int madvise(struct thread *, void *, int *); +int mincore(struct thread *, void *, int *); +int mprotect(struct thread *, void *, int *); +int msync(struct thread *, void *, int *); +int munmap(struct thread *, void *, int *); +int obreak(struct thread *, void *, int *); +int sbrk(struct thread *, void *, int *); +int sstk(struct thread *, void *, int *); +int swapon(struct thread *, void *, int *); #endif /* TYPEDEF_FOR_UAP */ -int grow __P((struct proc *, size_t)); -int grow_stack __P((struct proc *, size_t)); -int kernacc __P((caddr_t, int, int)); -vm_offset_t kmem_alloc __P((vm_map_t, vm_size_t)); -vm_offset_t kmem_alloc_nofault __P((vm_map_t, vm_size_t)); -vm_offset_t kmem_alloc_pageable __P((vm_map_t, vm_size_t)); -vm_offset_t kmem_alloc_wait __P((vm_map_t, vm_size_t)); -void kmem_free __P((vm_map_t, vm_offset_t, vm_size_t)); -void kmem_free_wakeup __P((vm_map_t, vm_offset_t, vm_size_t)); -void kmem_init __P((vm_offset_t, vm_offset_t)); -vm_offset_t kmem_malloc __P((vm_map_t, vm_size_t, boolean_t)); -vm_map_t kmem_suballoc __P((vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t)); -void munmapfd __P((struct thread *, int)); -int swaponvp __P((struct thread *, struct vnode *, dev_t , u_long)); -void swapout_procs __P((int)); -int useracc __P((caddr_t, int, int)); -int vm_fault __P((vm_map_t, vm_offset_t, vm_prot_t, int)); -void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t)); -void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t)); -int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t)); -int vm_fault_user_wire __P((vm_map_t, vm_offset_t, vm_offset_t)); -void vm_forkproc __P((struct thread *, struct proc *, struct thread *, int)); -void vm_waitproc __P((struct proc *)); -int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, void *, vm_ooffset_t)); -vm_offset_t vm_page_alloc_contig __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t)); -void vm_set_page_size __P((void)); -struct vmspace *vmspace_alloc __P((vm_offset_t, vm_offset_t)); -struct vmspace *vmspace_fork __P((struct vmspace *)); -void vmspace_exec __P((struct proc *)); -void vmspace_unshare __P((struct proc *)); -void vmspace_free __P((struct vmspace *)); -void vmspace_exitfree __P((struct proc *)); -void vnode_pager_setsize __P((struct vnode *, vm_ooffset_t)); -void vslock __P((caddr_t, u_int)); -void vsunlock __P((caddr_t, u_int)); -void vm_object_print __P((/* db_expr_t */ long, boolean_t, /* db_expr_t */ long, - char *)); -int vm_fault_quick __P((caddr_t v, int prot)); +int grow(struct proc *, size_t); +int grow_stack(struct proc *, size_t); +int kernacc(caddr_t, int, int); +vm_offset_t kmem_alloc(vm_map_t, vm_size_t); +vm_offset_t kmem_alloc_nofault(vm_map_t, vm_size_t); +vm_offset_t kmem_alloc_pageable(vm_map_t, vm_size_t); +vm_offset_t kmem_alloc_wait(vm_map_t, vm_size_t); +void kmem_free(vm_map_t, vm_offset_t, vm_size_t); +void kmem_free_wakeup(vm_map_t, vm_offset_t, vm_size_t); +void kmem_init(vm_offset_t, vm_offset_t); +vm_offset_t kmem_malloc(vm_map_t, vm_size_t, boolean_t); +vm_map_t kmem_suballoc(vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t); +void munmapfd(struct thread *, int); +int swaponvp(struct thread *, struct vnode *, dev_t , u_long); +void swapout_procs(int); +int useracc(caddr_t, int, int); +int vm_fault(vm_map_t, vm_offset_t, vm_prot_t, int); +void vm_fault_copy_entry(vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t); +void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t); +int vm_fault_wire(vm_map_t, vm_offset_t, vm_offset_t); +int vm_fault_user_wire(vm_map_t, vm_offset_t, vm_offset_t); +void vm_forkproc(struct thread *, struct proc *, struct thread *, int); +void vm_waitproc(struct proc *); +int vm_mmap(vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, void *, vm_ooffset_t); +vm_offset_t vm_page_alloc_contig(vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t); +void vm_set_page_size(void); +struct vmspace *vmspace_alloc(vm_offset_t, vm_offset_t); +struct vmspace *vmspace_fork(struct vmspace *); +void vmspace_exec(struct proc *); +void vmspace_unshare(struct proc *); +void vmspace_free(struct vmspace *); +void vmspace_exitfree(struct proc *); +void vnode_pager_setsize(struct vnode *, vm_ooffset_t); +void vslock(caddr_t, u_int); +void vsunlock(caddr_t, u_int); +void vm_object_print(/* db_expr_t */ long, boolean_t, /* db_expr_t */ long, + char *); +int vm_fault_quick(caddr_t v, int prot); #endif /* _KERNEL */ #endif /* !_VM_EXTERN_H_ */ diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 051e48e..3466360 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -95,8 +95,7 @@ #include <vm/vnode_pager.h> #include <vm/vm_extern.h> -static int vm_fault_additional_pages __P((vm_page_t, int, - int, vm_page_t *, int *)); +static int vm_fault_additional_pages(vm_page_t, int, int, vm_page_t *, int *); #define VM_FAULT_READ_AHEAD 8 #define VM_FAULT_READ_BEHIND 7 @@ -182,7 +181,7 @@ _unlock_things(struct faultstate *fs, int dealloc) * The map in question must be referenced, and remains so. * Caller may hold no locks. */ -static int vm_fault1 __P((vm_map_t, vm_offset_t, vm_prot_t, int)); +static int vm_fault1(vm_map_t, vm_offset_t, vm_prot_t, int); int vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 9f931a1..2adbb4a 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -99,7 +99,7 @@ extern int maxslp; * * Note: proc0 from proc.h */ -static void vm_init_limits __P((void *)); +static void vm_init_limits(void *); SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0) /* @@ -107,11 +107,11 @@ SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0) * * Note: run scheduling should be divorced from the vm system. */ -static void scheduler __P((void *)); +static void scheduler(void *); SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, scheduler, NULL) #ifndef NO_SWAPPING -static void swapout __P((struct proc *)); +static void swapout(struct proc *); #endif int diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 5114470..7230855 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -90,7 +90,7 @@ /* * System initialization */ -static void vm_mem_init __P((void *)); +static void vm_mem_init(void *); SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL) /* diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 0a75a9d..603ce6e 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -93,7 +93,7 @@ SYSCTL_INT(_vm, OID_AUTO, max_proc_mmap, CTLFLAG_RW, &max_proc_mmap, 0, ""); * if attacked from compromised user account but generous enough such that * multi-threaded processes are not unduly inconvenienced. */ -static void vmmapentry_rsrc_init __P((void *)); +static void vmmapentry_rsrc_init(void *); SYSINIT(vmmersrc, SI_SUB_KVM_RSRC, SI_ORDER_FIRST, vmmapentry_rsrc_init, NULL) static void diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index c4b94de..3489cc3 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -106,10 +106,10 @@ */ /* the kernel process "vm_pageout"*/ -static void vm_pageout __P((void)); -static int vm_pageout_clean __P((vm_page_t)); -static void vm_pageout_scan __P((int pass)); -static int vm_pageout_free_page_calc __P((vm_size_t count)); +static void vm_pageout(void); +static int vm_pageout_clean(vm_page_t); +static void vm_pageout_scan(int pass); +static int vm_pageout_free_page_calc(vm_size_t count); struct proc *pageproc; static struct kproc_desc page_kp = { @@ -121,7 +121,7 @@ SYSINIT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, kproc_start, &page_kp) #if !defined(NO_SWAPPING) /* the kernel process "vm_daemon"*/ -static void vm_daemon __P((void)); +static void vm_daemon(void); static struct proc *vmproc; static struct kproc_desc vm_kp = { @@ -203,10 +203,10 @@ int vm_pageout_page_count = VM_PAGEOUT_PAGE_COUNT; int vm_page_max_wired; /* XXX max # of wired pages system-wide */ #if !defined(NO_SWAPPING) -typedef void freeer_fcn_t __P((vm_map_t, vm_object_t, vm_pindex_t, int)); -static void vm_pageout_map_deactivate_pages __P((vm_map_t, vm_pindex_t)); +typedef void freeer_fcn_t(vm_map_t, vm_object_t, vm_pindex_t, int); +static void vm_pageout_map_deactivate_pages(vm_map_t, vm_pindex_t); static freeer_fcn_t vm_pageout_object_deactivate_pages; -static void vm_req_vmdaemon __P((void)); +static void vm_req_vmdaemon(void); #endif static void vm_pageout_page_stats(void); diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index d78537d..c909c68 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -98,16 +98,16 @@ extern int vm_pageout_deficit; * Signal pageout-daemon and wait for it. */ -extern void pagedaemon_wakeup __P((void)); +extern void pagedaemon_wakeup(void); #define VM_WAIT vm_wait() #define VM_WAITPFAULT vm_waitpfault() -extern void vm_wait __P((void)); -extern void vm_waitpfault __P((void)); +extern void vm_wait(void); +extern void vm_waitpfault(void); #ifdef _KERNEL -void vm_pageout_page __P((vm_page_t, vm_object_t)); -void vm_pageout_cluster __P((vm_page_t, vm_object_t)); -int vm_pageout_flush __P((vm_page_t *, int, int)); -void vm_pageout_page_free __P((vm_page_t)); +void vm_pageout_page(vm_page_t, vm_object_t); +void vm_pageout_cluster(vm_page_t, vm_object_t); +int vm_pageout_flush(vm_page_t *, int, int); +void vm_pageout_page_free(vm_page_t); #endif #endif /* _VM_VM_PAGEOUT_H_ */ diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 60f7e72..c3cbbc7 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -95,12 +95,12 @@ extern struct pagerops physpagerops; int cluster_pbuf_freecnt = -1; /* unlimited to begin with */ -static int dead_pager_getpages __P((vm_object_t, vm_page_t *, int, int)); -static vm_object_t dead_pager_alloc __P((void *, vm_ooffset_t, vm_prot_t, - vm_ooffset_t)); -static void dead_pager_putpages __P((vm_object_t, vm_page_t *, int, int, int *)); -static boolean_t dead_pager_haspage __P((vm_object_t, vm_pindex_t, int *, int *)); -static void dead_pager_dealloc __P((vm_object_t)); +static int dead_pager_getpages(vm_object_t, vm_page_t *, int, int); +static vm_object_t dead_pager_alloc(void *, vm_ooffset_t, vm_prot_t, + vm_ooffset_t); +static void dead_pager_putpages(vm_object_t, vm_page_t *, int, int, int *); +static boolean_t dead_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); +static void dead_pager_dealloc(vm_object_t); static int dead_pager_getpages(obj, ma, count, req) diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index df0a508..66fe080 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -53,14 +53,14 @@ TAILQ_HEAD(pagerlst, vm_object); struct bio; struct pagerops { - void (*pgo_init) __P((void)); /* Initialize pager. */ - vm_object_t (*pgo_alloc) __P((void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t)); /* Allocate pager. */ - void (*pgo_dealloc) __P((vm_object_t)); /* Disassociate. */ - int (*pgo_getpages) __P((vm_object_t, vm_page_t *, int, int)); /* Get (read) page. */ - void (*pgo_putpages) __P((vm_object_t, vm_page_t *, int, int, int *)); /* Put (write) page. */ - boolean_t (*pgo_haspage) __P((vm_object_t, vm_pindex_t, int *, int *)); /* Does pager have page? */ - void (*pgo_pageunswapped) __P((vm_page_t)); - void (*pgo_strategy) __P((vm_object_t, struct bio *)); + void (*pgo_init)(void); /* Initialize pager. */ + vm_object_t (*pgo_alloc)(void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t); /* Allocate pager. */ + void (*pgo_dealloc)(vm_object_t); /* Disassociate. */ + int (*pgo_getpages)(vm_object_t, vm_page_t *, int, int); /* Get (read) page. */ + void (*pgo_putpages)(vm_object_t, vm_page_t *, int, int, int *); /* Put (write) page. */ + boolean_t (*pgo_haspage)(vm_object_t, vm_pindex_t, int *, int *); /* Does pager have page? */ + void (*pgo_pageunswapped)(vm_page_t); + void (*pgo_strategy)(vm_object_t, struct bio *); }; /* @@ -92,19 +92,19 @@ extern int pager_map_size; extern struct pagerops *pagertab[]; extern struct mtx pbuf_mtx; -vm_object_t vm_pager_allocate __P((objtype_t, void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t)); -void vm_pager_bufferinit __P((void)); -void vm_pager_deallocate __P((vm_object_t)); -static __inline int vm_pager_get_pages __P((vm_object_t, vm_page_t *, int, int)); -static __inline boolean_t vm_pager_has_page __P((vm_object_t, vm_pindex_t, int *, int *)); -void vm_pager_init __P((void)); -vm_object_t vm_pager_object_lookup __P((struct pagerlst *, void *)); -vm_offset_t vm_pager_map_pages __P((vm_page_t *, int, boolean_t)); -vm_offset_t vm_pager_map_page __P((vm_page_t)); -void vm_pager_sync __P((void)); -void vm_pager_unmap_pages __P((vm_offset_t, int)); -void vm_pager_unmap_page __P((vm_offset_t)); -void vm_pager_strategy __P((vm_object_t object, struct bio *bp)); +vm_object_t vm_pager_allocate(objtype_t, void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t); +void vm_pager_bufferinit(void); +void vm_pager_deallocate(vm_object_t); +static __inline int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int); +static __inline boolean_t vm_pager_has_page(vm_object_t, vm_pindex_t, int *, int *); +void vm_pager_init(void); +vm_object_t vm_pager_object_lookup(struct pagerlst *, void *); +vm_offset_t vm_pager_map_pages(vm_page_t *, int, boolean_t); +vm_offset_t vm_pager_map_page(vm_page_t); +void vm_pager_sync(void); +void vm_pager_unmap_pages(vm_offset_t, int); +void vm_pager_unmap_page(vm_offset_t); +void vm_pager_strategy(vm_object_t object, struct bio *bp); /* * vm_page_get_pages: diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 48741af..a79a8e2 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -71,7 +71,7 @@ static int nswap; /* first block after the interleaved devs */ int nswdev = NSWAPDEV; int vm_swap_size; -static int swapdev_strategy __P((struct vop_strategy_args *ap)); +static int swapdev_strategy(struct vop_strategy_args *ap); struct vnode *swapdev_vp; /* diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 85d04e4..f069b6a 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -69,16 +69,16 @@ #include <vm/vnode_pager.h> #include <vm/vm_extern.h> -static void vnode_pager_init __P((void)); -static vm_offset_t vnode_pager_addr __P((struct vnode *vp, vm_ooffset_t address, - int *run)); -static void vnode_pager_iodone __P((struct buf *bp)); -static int vnode_pager_input_smlfs __P((vm_object_t object, vm_page_t m)); -static int vnode_pager_input_old __P((vm_object_t object, vm_page_t m)); -static void vnode_pager_dealloc __P((vm_object_t)); -static int vnode_pager_getpages __P((vm_object_t, vm_page_t *, int, int)); -static void vnode_pager_putpages __P((vm_object_t, vm_page_t *, int, boolean_t, int *)); -static boolean_t vnode_pager_haspage __P((vm_object_t, vm_pindex_t, int *, int *)); +static void vnode_pager_init(void); +static vm_offset_t vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, + int *run); +static void vnode_pager_iodone(struct buf *bp); +static int vnode_pager_input_smlfs(vm_object_t object, vm_page_t m); +static int vnode_pager_input_old(vm_object_t object, vm_page_t m); +static void vnode_pager_dealloc(vm_object_t); +static int vnode_pager_getpages(vm_object_t, vm_page_t *, int, int); +static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); +static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); struct pagerops vnodepagerops = { vnode_pager_init, diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h index 63f2d62..820d87e 100644 --- a/sys/vm/vnode_pager.h +++ b/sys/vm/vnode_pager.h @@ -43,17 +43,17 @@ #define _VNODE_PAGER_ 1 #ifdef _KERNEL -vm_object_t vnode_pager_alloc __P((void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t)); -struct vnode *vnode_pager_lock __P((vm_object_t)); +vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t); +struct vnode *vnode_pager_lock(vm_object_t); /* * XXX Generic routines; currently called by badly written FS code; these * XXX should go away soon. */ -int vnode_pager_generic_getpages __P((struct vnode *vp, vm_page_t *m, - int count, int reqpage)); -int vnode_pager_generic_putpages __P((struct vnode *vp, vm_page_t *m, +int vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, + int count, int reqpage); +int vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *m, int count, boolean_t sync, - int *rtvals)); + int *rtvals); #endif /* _KERNEL */ #endif /* _VNODE_PAGER_ */ |