From a6ee311a3eea863feb6f20a916e2e20ed4904014 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Wed, 20 Aug 2003 09:56:34 +0000 Subject: [PATCH] __P()!=wanted, remove old style prototypes from the vfs subtree --- sys/vfs/coda/coda_vfsops.c | 4 +- sys/vfs/coda/coda_vnops.h | 66 +++---- sys/vfs/deadfs/dead_vnops.c | 24 +-- sys/vfs/fdesc/fdesc.h | 10 +- sys/vfs/fdesc/fdesc_vfsops.c | 14 +- sys/vfs/fdesc/fdesc_vnops.c | 20 +- sys/vfs/fifofs/fifo.h | 6 +- sys/vfs/fifofs/fifo_vnops.c | 30 +-- sys/vfs/gnu/ext2fs/ext2_alloc.c | 4 +- sys/vfs/gnu/ext2fs/ext2_extern.h | 86 ++++----- sys/vfs/gnu/ext2fs/ext2_inode.c | 6 +- sys/vfs/gnu/ext2fs/ext2_lookup.c | 6 +- sys/vfs/gnu/ext2fs/ext2_subr.c | 4 +- sys/vfs/gnu/ext2fs/ext2_vfsops.c | 38 ++-- sys/vfs/gnu/ext2fs/ext2_vnops.c | 30 +-- sys/vfs/hpfs/hpfs.h | 16 +- sys/vfs/hpfs/hpfs_vfsops.c | 60 +++--- sys/vfs/hpfs/hpfs_vnops.c | 50 ++--- sys/vfs/isofs/cd9660/cd9660_node.c | 6 +- sys/vfs/isofs/cd9660/cd9660_node.h | 28 +-- sys/vfs/isofs/cd9660/cd9660_rrip.c | 62 +++---- sys/vfs/isofs/cd9660/cd9660_vfsops.c | 30 +-- sys/vfs/isofs/cd9660/cd9660_vnops.c | 32 ++-- sys/vfs/isofs/cd9660/iso.h | 30 +-- sys/vfs/isofs/cd9660/iso_rrip.h | 18 +- sys/vfs/mfs/mfs_extern.h | 10 +- sys/vfs/mfs/mfs_vfsops.c | 14 +- sys/vfs/mfs/mfs_vnops.c | 24 +-- sys/vfs/msdosfs/denode.h | 36 ++-- sys/vfs/msdosfs/direntry.h | 24 +-- sys/vfs/msdosfs/fat.h | 16 +- sys/vfs/msdosfs/msdosfs_conv.c | 4 +- sys/vfs/msdosfs/msdosfs_denode.c | 10 +- sys/vfs/msdosfs/msdosfs_fat.c | 30 +-- sys/vfs/msdosfs/msdosfs_vfsops.c | 32 ++-- sys/vfs/msdosfs/msdosfs_vnops.c | 46 ++--- sys/vfs/msdosfs/msdosfsmount.h | 8 +- sys/vfs/nfs/krpc.h | 12 +- sys/vfs/nfs/nfs.h | 264 +++++++++++++-------------- sys/vfs/nfs/nfs_bio.c | 6 +- sys/vfs/nfs/nfs_nqlease.c | 26 +-- sys/vfs/nfs/nfs_serv.c | 10 +- sys/vfs/nfs/nfs_socket.c | 24 +-- sys/vfs/nfs/nfs_subs.c | 6 +- sys/vfs/nfs/nfs_syscalls.c | 20 +- sys/vfs/nfs/nfs_vfsops.c | 44 ++--- sys/vfs/nfs/nfs_vnops.c | 90 ++++----- sys/vfs/nfs/nfsm_subs.h | 10 +- sys/vfs/nfs/nfsnode.h | 22 +-- sys/vfs/nfs/nqnfs.h | 24 +-- sys/vfs/ntfs/ntfs.h | 4 +- sys/vfs/ntfs/ntfs_ihash.h | 12 +- sys/vfs/ntfs/ntfs_subr.c | 10 +- sys/vfs/ntfs/ntfs_subr.h | 66 +++---- sys/vfs/ntfs/ntfs_vfsops.c | 60 +++--- sys/vfs/ntfs/ntfs_vnops.c | 40 ++-- sys/vfs/portal/portal_vfsops.c | 16 +- sys/vfs/portal/portal_vnops.c | 24 +-- sys/vfs/procfs/procfs.h | 68 +++---- sys/vfs/procfs/procfs_ctl.c | 4 +- sys/vfs/procfs/procfs_mem.c | 6 +- sys/vfs/procfs/procfs_vfsops.c | 14 +- sys/vfs/procfs/procfs_vnops.c | 34 ++-- sys/vfs/specfs/spec_vnops.c | 34 ++-- sys/vfs/ufs/ffs_alloc.c | 34 ++-- sys/vfs/ufs/ffs_extern.h | 96 +++++----- sys/vfs/ufs/ffs_inode.c | 6 +- sys/vfs/ufs/ffs_softdep.c | 136 +++++++------- sys/vfs/ufs/ffs_subr.c | 4 +- sys/vfs/ufs/ffs_vfsops.c | 14 +- sys/vfs/ufs/ffs_vnops.c | 12 +- sys/vfs/ufs/quota.h | 28 +-- sys/vfs/ufs/ufs_extern.h | 86 ++++----- sys/vfs/ufs/ufs_quota.c | 18 +- sys/vfs/ufs/ufs_vnops.c | 76 ++++---- sys/vfs/ufs/ufsmount.h | 12 +- sys/vfs/umapfs/umap.h | 12 +- sys/vfs/umapfs/umap_subr.c | 10 +- sys/vfs/umapfs/umap_vfsops.c | 44 ++--- sys/vfs/umapfs/umap_vnops.c | 18 +- sys/vfs/union/union.h | 44 ++--- sys/vfs/union/union_subr.c | 36 ++-- sys/vfs/union/union_vfsops.c | 18 +- sys/vfs/union/union_vnops.c | 78 ++++---- 84 files changed, 1333 insertions(+), 1333 deletions(-) diff --git a/sys/vfs/coda/coda_vfsops.c b/sys/vfs/coda/coda_vfsops.c index 1249259ac8..b2d575b7ee 100644 --- a/sys/vfs/coda/coda_vfsops.c +++ b/sys/vfs/coda/coda_vfsops.c @@ -28,7 +28,7 @@ * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_vfsops.c,v 1.24.2.1 2001/07/26 20:36:45 iedowse Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_vfsops.c,v 1.8 2003/08/07 21:17:40 dillon Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_vfsops.c,v 1.9 2003/08/20 09:56:31 rob Exp $ * */ @@ -85,7 +85,7 @@ struct coda_op_stats coda_vfsopstats[CODA_VFSOPS_SIZE]; #define MRAK_INT_GEN(op) (coda_vfsopstats[op].gen_intrn++) extern int coda_nc_initialized; /* Set if cache has been initialized */ -extern int vc_nb_open __P((dev_t, int, int, d_thread_t *)); +extern int vc_nb_open (dev_t, int, int, d_thread_t *); int coda_vfsopstats_init(void) diff --git a/sys/vfs/coda/coda_vnops.h b/sys/vfs/coda/coda_vnops.h index 7ac90244b4..129d40df4d 100644 --- a/sys/vfs/coda/coda_vnops.h +++ b/sys/vfs/coda/coda_vnops.h @@ -28,7 +28,7 @@ * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.6 1999/08/28 00:40:58 peter Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.h,v 1.3 2003/06/25 03:55:44 dillon Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.h,v 1.4 2003/08/20 09:56:31 rob Exp $ * */ @@ -48,38 +48,38 @@ /* NetBSD interfaces to the vnodeops */ -int coda_open __P((void *)); -int coda_close __P((void *)); -int coda_read __P((void *)); -int coda_write __P((void *)); -int coda_ioctl __P((void *)); -/* 1.3 int cfs_select __P((void *));*/ -int coda_getattr __P((void *)); -int coda_setattr __P((void *)); -int coda_access __P((void *)); -int coda_abortop __P((void *)); -int coda_readlink __P((void *)); -int coda_fsync __P((void *)); -int coda_inactive __P((void *)); -int coda_lookup __P((void *)); -int coda_create __P((void *)); -int coda_remove __P((void *)); -int coda_link __P((void *)); -int coda_rename __P((void *)); -int coda_mkdir __P((void *)); -int coda_rmdir __P((void *)); -int coda_symlink __P((void *)); -int coda_readdir __P((void *)); -int coda_bmap __P((void *)); -int coda_strategy __P((void *)); -int coda_reclaim __P((void *)); -int coda_lock __P((void *)); -int coda_unlock __P((void *)); -int coda_islocked __P((void *)); -int coda_vop_error __P((void *)); -int coda_vop_nop __P((void *)); -int coda_fbsd_getpages __P((void *)); -int coda_fbsd_putpages __P((void *)); +int coda_open (void *); +int coda_close (void *); +int coda_read (void *); +int coda_write (void *); +int coda_ioctl (void *); +/* 1.3 int cfs_select (void *);*/ +int coda_getattr (void *); +int coda_setattr (void *); +int coda_access (void *); +int coda_abortop (void *); +int coda_readlink (void *); +int coda_fsync (void *); +int coda_inactive (void *); +int coda_lookup (void *); +int coda_create (void *); +int coda_remove (void *); +int coda_link (void *); +int coda_rename (void *); +int coda_mkdir (void *); +int coda_rmdir (void *); +int coda_symlink (void *); +int coda_readdir (void *); +int coda_bmap (void *); +int coda_strategy (void *); +int coda_reclaim (void *); +int coda_lock (void *); +int coda_unlock (void *); +int coda_islocked (void *); +int coda_vop_error (void *); +int coda_vop_nop (void *); +int coda_fbsd_getpages (void *); +int coda_fbsd_putpages (void *); int (**coda_vnodeop_p)(void *); diff --git a/sys/vfs/deadfs/dead_vnops.c b/sys/vfs/deadfs/dead_vnops.c index d363bfac36..06bd7e96ef 100644 --- a/sys/vfs/deadfs/dead_vnops.c +++ b/sys/vfs/deadfs/dead_vnops.c @@ -32,7 +32,7 @@ * * @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/miscfs/deadfs/dead_vnops.c,v 1.26 1999/08/28 00:46:42 peter Exp $ - * $DragonFly: src/sys/vfs/deadfs/dead_vnops.c,v 1.5 2003/07/26 20:05:55 rob Exp $ + * $DragonFly: src/sys/vfs/deadfs/dead_vnops.c,v 1.6 2003/08/20 09:56:31 rob Exp $ */ #include @@ -43,20 +43,20 @@ #include #include -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/vfs/fdesc/fdesc.h b/sys/vfs/fdesc/fdesc.h index cda33dc9e3..c0221c0772 100644 --- a/sys/vfs/fdesc/fdesc.h +++ b/sys/vfs/fdesc/fdesc.h @@ -36,7 +36,7 @@ * @(#)fdesc.h 8.5 (Berkeley) 1/21/94 * * $FreeBSD: src/sys/miscfs/fdesc/fdesc.h,v 1.8.2.1 2001/10/22 22:49:26 chris Exp $ - * $DragonFly: src/sys/vfs/fdesc/fdesc.h,v 1.3 2003/06/25 03:55:58 dillon Exp $ + * $DragonFly: src/sys/vfs/fdesc/fdesc.h,v 1.4 2003/08/20 09:56:31 rob Exp $ */ #ifdef _KERNEL @@ -63,8 +63,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/vfs/fdesc/fdesc_vfsops.c b/sys/vfs/fdesc/fdesc_vfsops.c index bd16f86709..18a9de6a9c 100644 --- a/sys/vfs/fdesc/fdesc_vfsops.c +++ b/sys/vfs/fdesc/fdesc_vfsops.c @@ -36,7 +36,7 @@ * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vfsops.c,v 1.22.2.3 2002/08/23 17:42:39 njl Exp $ - * $DragonFly: src/sys/vfs/fdesc/fdesc_vfsops.c,v 1.4 2003/08/07 21:17:40 dillon Exp $ + * $DragonFly: src/sys/vfs/fdesc/fdesc_vfsops.c,v 1.5 2003/08/20 09:56:31 rob Exp $ */ /* @@ -59,12 +59,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/vfs/fdesc/fdesc_vnops.c b/sys/vfs/fdesc/fdesc_vnops.c index d91fb2e17e..c1fca74fed 100644 --- a/sys/vfs/fdesc/fdesc_vnops.c +++ b/sys/vfs/fdesc/fdesc_vnops.c @@ -36,7 +36,7 @@ * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vnops.c,v 1.47.2.1 2001/10/22 22:49:26 chris Exp $ - * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.6 2003/08/07 21:17:40 dillon Exp $ + * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.7 2003/08/20 09:56:31 rob Exp $ */ /* @@ -74,15 +74,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/vfs/fifofs/fifo.h b/sys/vfs/fifofs/fifo.h index fa25398864..fb69db0c20 100644 --- a/sys/vfs/fifofs/fifo.h +++ b/sys/vfs/fifofs/fifo.h @@ -32,7 +32,7 @@ * * @(#)fifo.h 8.6 (Berkeley) 5/21/95 * $FreeBSD: src/sys/miscfs/fifofs/fifo.h,v 1.16 1999/08/28 00:46:46 peter Exp $ - * $DragonFly: src/sys/vfs/fifofs/fifo.h,v 1.2 2003/06/17 04:28:42 dillon Exp $ + * $DragonFly: src/sys/vfs/fifofs/fifo.h,v 1.3 2003/08/20 09:56:31 rob Exp $ */ extern vop_t **fifo_vnodeop_p; @@ -40,6 +40,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/vfs/fifofs/fifo_vnops.c b/sys/vfs/fifofs/fifo_vnops.c index af79d640fe..11bbdf3dc3 100644 --- a/sys/vfs/fifofs/fifo_vnops.c +++ b/sys/vfs/fifofs/fifo_vnops.c @@ -32,7 +32,7 @@ * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 * $FreeBSD: src/sys/miscfs/fifofs/fifo_vnops.c,v 1.45.2.4 2003/04/22 10:11:24 bde Exp $ - * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.7 2003/08/07 21:17:40 dillon Exp $ + * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.8 2003/08/20 09:56:31 rob Exp $ */ #include @@ -63,20 +63,20 @@ 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_inactive __P((struct vop_inactive_args *)); -static int fifo_bmap __P((struct vop_bmap_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_inactive (struct vop_inactive_args *); +static int fifo_bmap (struct vop_bmap_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/vfs/gnu/ext2fs/ext2_alloc.c b/sys/vfs/gnu/ext2fs/ext2_alloc.c index 533a975a9b..eed771e24b 100644 --- a/sys/vfs/gnu/ext2fs/ext2_alloc.c +++ b/sys/vfs/gnu/ext2fs/ext2_alloc.c @@ -38,7 +38,7 @@ * * @(#)ext2_alloc.c 8.8 (Berkeley) 2/21/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.28.2.2 2002/07/01 00:18:51 iedowse Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_alloc.c,v 1.4 2003/08/07 21:17:40 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_alloc.c,v 1.5 2003/08/20 09:56:31 rob Exp $ */ #include "opt_quota.h" @@ -60,7 +60,7 @@ #include "fs.h" #include "ext2_extern.h" -static void ext2_fserr __P((struct ext2_sb_info *, u_int, char *)); +static void ext2_fserr (struct ext2_sb_info *, u_int, char *); /* * Linux calls this functions at the following locations: diff --git a/sys/vfs/gnu/ext2fs/ext2_extern.h b/sys/vfs/gnu/ext2fs/ext2_extern.h index 56e2f39a45..57f7254a7a 100644 --- a/sys/vfs/gnu/ext2fs/ext2_extern.h +++ b/sys/vfs/gnu/ext2fs/ext2_extern.h @@ -38,7 +38,7 @@ * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_extern.h,v 1.22.6.1 2000/11/05 19:17:40 bde Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_extern.h,v 1.3 2003/07/21 07:57:43 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_extern.h,v 1.4 2003/08/20 09:56:31 rob Exp $ */ #ifndef _SYS_GNU_EXT2FS_EXT2_EXTERN_H_ @@ -51,49 +51,49 @@ struct mount; struct vfsconf; struct vnode; -int ext2_alloc __P((struct inode *, - daddr_t, daddr_t, int, struct ucred *, daddr_t *)); -int ext2_balloc __P((struct inode *, - daddr_t, int, struct ucred *, struct buf **, int)); -int ext2_blkatoff __P((struct vnode *, off_t, char **, struct buf **)); -void ext2_blkfree __P((struct inode *, daddr_t, long)); -daddr_t ext2_blkpref __P((struct inode *, daddr_t, int, daddr_t *, daddr_t)); -int ext2_bmap __P((struct vop_bmap_args *)); -int ext2_init __P((struct vfsconf *)); -int ext2_reallocblks __P((struct vop_reallocblks_args *)); -int ext2_reclaim __P((struct vop_reclaim_args *)); -void ext2_setblock __P((struct ext2_sb_info *, u_char *, daddr_t)); -int ext2_truncate __P((struct vnode *, off_t, int, struct ucred *, struct thread *)); -int ext2_update __P((struct vnode *, int)); -int ext2_valloc __P((struct vnode *, int, struct ucred *, struct vnode **)); -int ext2_vfree __P((struct vnode *, ino_t, int)); -int ext2_lookup __P((struct vop_cachedlookup_args *)); -int ext2_readdir __P((struct vop_readdir_args *)); -void ext2_print_dinode __P((struct dinode *)); -void ext2_print_inode __P((struct inode *)); -int ext2_direnter __P((struct inode *, - struct vnode *, struct componentname *)); -int ext2_dirremove __P((struct vnode *, struct componentname *)); -int ext2_dirrewrite __P((struct inode *, - struct inode *, struct componentname *)); -int ext2_dirempty __P((struct inode *, ino_t, struct ucred *)); -int ext2_checkpath __P((struct inode *, struct inode *, struct ucred *)); -struct ext2_group_desc * get_group_desc __P((struct mount * , - unsigned int , struct buf ** )); -int ext2_group_sparse __P((int group)); -void ext2_discard_prealloc __P((struct inode *)); -int ext2_inactive __P((struct vop_inactive_args *)); -int ext2_new_block __P ((struct mount * mp, unsigned long goal, +int ext2_alloc (struct inode *, + daddr_t, daddr_t, int, struct ucred *, daddr_t *); +int ext2_balloc (struct inode *, + daddr_t, int, struct ucred *, struct buf **, int); +int ext2_blkatoff (struct vnode *, off_t, char **, struct buf **); +void ext2_blkfree (struct inode *, daddr_t, long); +daddr_t ext2_blkpref (struct inode *, daddr_t, int, daddr_t *, daddr_t); +int ext2_bmap (struct vop_bmap_args *); +int ext2_init (struct vfsconf *); +int ext2_reallocblks (struct vop_reallocblks_args *); +int ext2_reclaim (struct vop_reclaim_args *); +void ext2_setblock (struct ext2_sb_info *, u_char *, daddr_t); +int ext2_truncate (struct vnode *, off_t, int, struct ucred *, struct thread *); +int ext2_update (struct vnode *, int); +int ext2_valloc (struct vnode *, int, struct ucred *, struct vnode **); +int ext2_vfree (struct vnode *, ino_t, int); +int ext2_lookup (struct vop_cachedlookup_args *); +int ext2_readdir (struct vop_readdir_args *); +void ext2_print_dinode (struct dinode *); +void ext2_print_inode (struct inode *); +int ext2_direnter (struct inode *, + struct vnode *, struct componentname *); +int ext2_dirremove (struct vnode *, struct componentname *); +int ext2_dirrewrite (struct inode *, + struct inode *, struct componentname *); +int ext2_dirempty (struct inode *, ino_t, struct ucred *); +int ext2_checkpath (struct inode *, struct inode *, struct ucred *); +struct ext2_group_desc * get_group_desc (struct mount * , + unsigned int , struct buf ** ); +int ext2_group_sparse (int group); +void ext2_discard_prealloc (struct inode *); +int ext2_inactive (struct vop_inactive_args *); +int ext2_new_block (struct mount * mp, unsigned long goal, u_int32_t * prealloc_count, - u_int32_t * prealloc_block)); -ino_t ext2_new_inode __P ((const struct inode * dir, int mode)); -unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars)); -void ext2_free_blocks __P((struct mount * mp, unsigned long block, - unsigned long count)); -void ext2_free_inode __P((struct inode * inode)); -void ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di)); -void ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei)); -void mark_buffer_dirty __P((struct buf *bh)); + u_int32_t * prealloc_block); +ino_t ext2_new_inode (const struct inode * dir, int mode); +unsigned long ext2_count_free (struct buf *map, unsigned int numchars); +void ext2_free_blocks (struct mount * mp, unsigned long block, + unsigned long count); +void ext2_free_inode (struct inode * inode); +void ext2_ei2di (struct ext2_inode *ei, struct dinode *di); +void ext2_di2ei (struct dinode *di, struct ext2_inode *ei); +void mark_buffer_dirty (struct buf *bh); /* * This macro allows the ufs code to distinguish between an EXT2 and a diff --git a/sys/vfs/gnu/ext2fs/ext2_inode.c b/sys/vfs/gnu/ext2fs/ext2_inode.c index 168a12f025..f732bb4217 100644 --- a/sys/vfs/gnu/ext2fs/ext2_inode.c +++ b/sys/vfs/gnu/ext2fs/ext2_inode.c @@ -38,7 +38,7 @@ * * @(#)ext2_inode.c 8.5 (Berkeley) 12/30/93 * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode.c,v 1.24.2.1 2000/08/03 00:52:57 peter Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_inode.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_inode.c,v 1.6 2003/08/20 09:56:31 rob Exp $ */ #include "opt_quota.h" @@ -63,8 +63,8 @@ #include "fs.h" #include "ext2_extern.h" -static int ext2_indirtrunc __P((struct inode *, daddr_t, daddr_t, daddr_t, int, - long *)); +static int ext2_indirtrunc (struct inode *, daddr_t, daddr_t, daddr_t, int, + long *); int ext2_init(struct vfsconf *vfsp) diff --git a/sys/vfs/gnu/ext2fs/ext2_lookup.c b/sys/vfs/gnu/ext2fs/ext2_lookup.c index efc92afe51..6267579f95 100644 --- a/sys/vfs/gnu/ext2fs/ext2_lookup.c +++ b/sys/vfs/gnu/ext2fs/ext2_lookup.c @@ -5,7 +5,7 @@ * University of Utah, Department of Computer Science * * $FreeBSD: src/sys/gnu/ext2fs/ext2_lookup.c,v 1.21.2.3 2002/11/17 02:02:42 bde Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_lookup.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_lookup.c,v 1.6 2003/08/20 09:56:31 rob Exp $ */ /* * Copyright (c) 1989, 1993 @@ -110,9 +110,9 @@ static u_char dt_to_ext2_ft[] = { ((dt) > sizeof(dt_to_ext2_ft) / sizeof(dt_to_ext2_ft[0]) ? \ EXT2_FT_UNKNOWN : dt_to_ext2_ft[(dt)]) -static int ext2_dirbadentry __P((struct vnode *dp, +static int ext2_dirbadentry (struct vnode *dp, struct ext2_dir_entry_2 *de, - int entryoffsetinblock)); + int entryoffsetinblock); /* * Vnode op for reading directories. diff --git a/sys/vfs/gnu/ext2fs/ext2_subr.c b/sys/vfs/gnu/ext2fs/ext2_subr.c index 6721704ff3..aca7164e59 100644 --- a/sys/vfs/gnu/ext2fs/ext2_subr.c +++ b/sys/vfs/gnu/ext2fs/ext2_subr.c @@ -38,7 +38,7 @@ * * @(#)ext2_subr.c 8.2 (Berkeley) 9/21/93 * $FreeBSD: src/sys/gnu/ext2fs/ext2_subr.c,v 1.13.2.2 2000/08/03 18:48:27 peter Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_subr.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_subr.c,v 1.6 2003/08/20 09:56:31 rob Exp $ */ #include @@ -57,7 +57,7 @@ #include "opt_ddb.h" #ifdef DDB -void ext2_checkoverlap __P((struct buf *, struct inode *)); +void ext2_checkoverlap (struct buf *, struct inode *); #endif /* diff --git a/sys/vfs/gnu/ext2fs/ext2_vfsops.c b/sys/vfs/gnu/ext2fs/ext2_vfsops.c index e4a0be97a1..ac68c895b4 100644 --- a/sys/vfs/gnu/ext2fs/ext2_vfsops.c +++ b/sys/vfs/gnu/ext2fs/ext2_vfsops.c @@ -38,7 +38,7 @@ * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.63.2.7 2002/07/01 00:18:51 iedowse Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.9 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.10 2003/08/20 09:56:31 rob Exp $ */ #include "opt_quota.h" @@ -70,19 +70,19 @@ #include "ext2_fs.h" #include "ext2_fs_sb.h" -static int ext2_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -static int ext2_flushfiles __P((struct mount *mp, int flags, struct thread *td)); -static int ext2_mount __P((struct mount *, - char *, caddr_t, struct nameidata *, struct thread *)); -static int ext2_mountfs __P((struct vnode *, struct mount *, struct thread *)); -static int ext2_reload __P((struct mount *mountp, struct ucred *cred, - struct thread *p)); -static int ext2_sbupdate __P((struct ufsmount *, int)); -static int ext2_statfs __P((struct mount *, struct statfs *, struct thread *)); -static int ext2_sync __P((struct mount *, int, struct thread *)); -static int ext2_unmount __P((struct mount *, int, struct thread *)); -static int ext2_vget __P((struct mount *, ino_t, struct vnode **)); -static int ext2_vptofh __P((struct vnode *, struct fid *)); +static int ext2_fhtovp (struct mount *, struct fid *, struct vnode **); +static int ext2_flushfiles (struct mount *mp, int flags, struct thread *td); +static int ext2_mount (struct mount *, + char *, caddr_t, struct nameidata *, struct thread *); +static int ext2_mountfs (struct vnode *, struct mount *, struct thread *); +static int ext2_reload (struct mount *mountp, struct ucred *cred, + struct thread *p); +static int ext2_sbupdate (struct ufsmount *, int); +static int ext2_statfs (struct mount *, struct statfs *, struct thread *); +static int ext2_sync (struct mount *, int, struct thread *); +static int ext2_unmount (struct mount *, int, struct thread *); +static int ext2_vget (struct mount *, ino_t, struct vnode **); +static int ext2_vptofh (struct vnode *, struct fid *); static MALLOC_DEFINE(M_EXT2NODE, "EXT2 node", "EXT2 vnode private part"); @@ -109,14 +109,14 @@ VFS_SET(ext2fs_vfsops, ext2fs, 0); static int ext2fs_inode_hash_lock; -static int ext2_check_sb_compat __P((struct ext2_super_block *es, - dev_t dev, int ronly)); -static int compute_sb_data __P((struct vnode * devvp, +static int ext2_check_sb_compat (struct ext2_super_block *es, + dev_t dev, int ronly); +static int compute_sb_data (struct vnode * devvp, struct ext2_super_block * es, - struct ext2_sb_info * fs)); + struct ext2_sb_info * fs); #ifdef notyet -static int ext2_mountroot __P((void)); +static int ext2_mountroot (void); /* * Called by main() when ext2fs is going to be mounted as root. diff --git a/sys/vfs/gnu/ext2fs/ext2_vnops.c b/sys/vfs/gnu/ext2fs/ext2_vnops.c index 6f0865386e..0723571cfc 100644 --- a/sys/vfs/gnu/ext2fs/ext2_vnops.c +++ b/sys/vfs/gnu/ext2fs/ext2_vnops.c @@ -44,7 +44,7 @@ * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 * @(#)ext2_vnops.c 8.7 (Berkeley) 2/3/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.51.2.2 2003/01/02 17:26:18 bde Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.8 2003/08/20 09:56:31 rob Exp $ */ #include "opt_quota.h" @@ -80,21 +80,21 @@ #include "ext2_extern.h" #include "ext2_fs.h" -static int ext2_makeinode __P((int mode, struct vnode *, struct vnode **, struct componentname *)); +static int ext2_makeinode (int mode, struct vnode *, struct vnode **, struct componentname *); -static int ext2_fsync __P((struct vop_fsync_args *)); -static int ext2_read __P((struct vop_read_args *)); -static int ext2_write __P((struct vop_write_args *)); -static int ext2_remove __P((struct vop_remove_args *)); -static int ext2_link __P((struct vop_link_args *)); -static int ext2_rename __P((struct vop_rename_args *)); -static int ext2_mkdir __P((struct vop_mkdir_args *)); -static int ext2_rmdir __P((struct vop_rmdir_args *)); -static int ext2_create __P((struct vop_create_args *)); -static int ext2_mknod __P((struct vop_mknod_args *)); -static int ext2_symlink __P((struct vop_symlink_args *)); -static int ext2_getpages __P((struct vop_getpages_args *)); -static int ext2_putpages __P((struct vop_putpages_args *)); +static int ext2_fsync (struct vop_fsync_args *); +static int ext2_read (struct vop_read_args *); +static int ext2_write (struct vop_write_args *); +static int ext2_remove (struct vop_remove_args *); +static int ext2_link (struct vop_link_args *); +static int ext2_rename (struct vop_rename_args *); +static int ext2_mkdir (struct vop_mkdir_args *); +static int ext2_rmdir (struct vop_rmdir_args *); +static int ext2_create (struct vop_create_args *); +static int ext2_mknod (struct vop_mknod_args *); +static int ext2_symlink (struct vop_symlink_args *); +static int ext2_getpages (struct vop_getpages_args *); +static int ext2_putpages (struct vop_putpages_args *); /* Global vfs data structures for ufs. */ vop_t **ext2_vnodeop_p; diff --git a/sys/vfs/hpfs/hpfs.h b/sys/vfs/hpfs/hpfs.h index 2973aaf101..df7cfac026 100644 --- a/sys/vfs/hpfs/hpfs.h +++ b/sys/vfs/hpfs/hpfs.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs.h,v 1.1 1999/12/09 19:09:58 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs.h,v 1.5 2003/08/15 07:26:15 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs.h,v 1.6 2003/08/20 09:56:32 rob Exp $ */ /*#define HPFS_DEBUG 10*/ @@ -392,7 +392,7 @@ MALLOC_DECLARE(M_HPFSNO); #define MALLOC_DEFINE(a, b, c) #define M_HPFSMNT M_TEMP #define M_HPFSNO M_TEMP -typedef int (vop_t) __P((void *)); +typedef int (vop_t) (void *); #define HASHINIT(a, b, c, d) hashinit((a), (b), (c), (d)) #define bqrelse(bp) brelse(bp) #define VOP__LOCK(a, b, c) VOP_LOCK((a), (b) ? LK_EXCLUSIVE : LK_SHARED) @@ -412,10 +412,10 @@ typedef int (vop_t) __P((void *)); extern vop_t ** hpfs_vnodeop_p; /* Hash routines, too small to be separate header */ -void hpfs_hphashinit __P((void)); -struct hpfsnode *hpfs_hphashlookup __P((dev_t, lsn_t)); -struct hpfsnode *hpfs_hphashget __P((dev_t, lsn_t)); -struct vnode *hpfs_hphashvget __P((dev_t, lsn_t, struct thread *)); -void hpfs_hphashins __P((struct hpfsnode *)); -void hpfs_hphashrem __P((struct hpfsnode *)); +void hpfs_hphashinit (void); +struct hpfsnode *hpfs_hphashlookup (dev_t, lsn_t); +struct hpfsnode *hpfs_hphashget (dev_t, lsn_t); +struct vnode *hpfs_hphashvget (dev_t, lsn_t, struct thread *); +void hpfs_hphashins (struct hpfsnode *); +void hpfs_hphashrem (struct hpfsnode *); extern struct lock hpfs_hphash_lock; diff --git a/sys/vfs/hpfs/hpfs_vfsops.c b/sys/vfs/hpfs/hpfs_vfsops.c index 57211eb30f..66e8a7a7ad 100644 --- a/sys/vfs/hpfs/hpfs_vfsops.c +++ b/sys/vfs/hpfs/hpfs_vfsops.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.3.2.2 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.8 2003/08/15 07:26:15 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.9 2003/08/20 09:56:32 rob Exp $ */ @@ -63,42 +63,42 @@ MALLOC_DEFINE(M_HPFSMNT, "HPFS mount", "HPFS mount structure"); MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure"); #endif -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, - struct vnode **vpp)); -static int hpfs_mountfs __P((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_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, + struct vnode **vpp); +static int hpfs_mountfs (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 **); #if !defined(__FreeBSD__) -static int hpfs_quotactl __P((struct mount *, int, uid_t, caddr_t, - struct proc *)); -static int hpfs_start __P((struct mount *, int, struct proc *)); -static int hpfs_sync __P((struct mount *, int, struct ucred *, - struct proc *)); +static int hpfs_quotactl (struct mount *, int, uid_t, caddr_t, + struct proc *); +static int hpfs_start (struct mount *, int, struct proc *); +static int hpfs_sync (struct mount *, int, struct ucred *, + struct proc *); #endif #if defined(__FreeBSD__) struct sockaddr; -static int hpfs_mount __P((struct mount *, char *, caddr_t, - struct nameidata *, struct thread *)); -static int hpfs_init __P((struct vfsconf *)); -static int hpfs_checkexp __P((struct mount *, struct sockaddr *, - int *, struct ucred **)); +static int hpfs_mount (struct mount *, char *, caddr_t, + struct nameidata *, struct thread *); +static int hpfs_init (struct vfsconf *); +static int hpfs_checkexp (struct mount *, struct sockaddr *, + int *, struct ucred **); #else /* defined(__NetBSD__) */ -static int hpfs_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct proc *)); -static void hpfs_init __P((void)); -static int hpfs_mountroot __P((void)); -static int hpfs_sysctl __P((int *, u_int, void *, size_t *, void *, - size_t, struct proc *)); -static int hpfs_checkexp __P((struct mount *, struct mbuf *, - int *, struct ucred **)); +static int hpfs_mount (struct mount *, const char *, void *, + struct nameidata *, struct proc *); +static void hpfs_init (void); +static int hpfs_mountroot (void); +static int hpfs_sysctl (int *, u_int, void *, size_t *, void *, + size_t, struct proc *); +static int hpfs_checkexp (struct mount *, struct mbuf *, + int *, struct ucred **); #endif /*ARGSUSED*/ diff --git a/sys/vfs/hpfs/hpfs_vnops.c b/sys/vfs/hpfs/hpfs_vnops.c index bc7336c44d..1ae7dc87ac 100644 --- a/sys/vfs/hpfs/hpfs_vnops.c +++ b/sys/vfs/hpfs/hpfs_vnops.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.2.2.2 2002/01/15 18:35:09 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.8 2003/08/15 07:26:15 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.9 2003/08/20 09:56:32 rob Exp $ */ #include @@ -68,31 +68,31 @@ #include "hpfs_subr.h" #include "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_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); #if defined(__FreeBSD__) -static int hpfs_getpages __P((struct vop_getpages_args *ap)); -static int hpfs_putpages __P((struct vop_putpages_args *)); -static int hpfs_fsync __P((struct vop_fsync_args *ap)); +static int hpfs_getpages (struct vop_getpages_args *ap); +static int hpfs_putpages (struct vop_putpages_args *); +static int hpfs_fsync (struct vop_fsync_args *ap); #endif -static int hpfs_pathconf __P((struct vop_pathconf_args *ap)); +static int hpfs_pathconf (struct vop_pathconf_args *ap); #if defined(__FreeBSD__) int @@ -1441,7 +1441,7 @@ struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = { { &vop_truncate_desc, genfs_eopnotsupp }, /* truncate */ { &vop_update_desc, genfs_eopnotsupp }, /* update */ { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ - { (struct vnodeop_desc *)NULL, (int (*) __P((void *)))NULL } + { (struct vnodeop_desc *)NULL, (int (*) (void *))NULL } }; struct vnodeopv_desc ntfs_vnodeop_opv_desc = { &ntfs_vnodeop_p, ntfs_vnodeop_entries }; diff --git a/sys/vfs/isofs/cd9660/cd9660_node.c b/sys/vfs/isofs/cd9660/cd9660_node.c index b4875acf54..9dc2ed5abe 100644 --- a/sys/vfs/isofs/cd9660/cd9660_node.c +++ b/sys/vfs/isofs/cd9660/cd9660_node.c @@ -37,7 +37,7 @@ * * @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.c,v 1.29.2.1 2000/07/08 14:35:56 bp Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.c,v 1.6 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.c,v 1.7 2003/08/20 09:56:32 rob Exp $ */ #include @@ -63,8 +63,8 @@ static u_long isohash; static struct lwkt_token cd9660_ihash_token; #endif -static void cd9660_ihashrem __P((struct iso_node *)); -static unsigned cd9660_chars2ui __P((unsigned char *begin, int len)); +static void cd9660_ihashrem (struct iso_node *); +static unsigned cd9660_chars2ui (unsigned char *begin, int len); /* * Initialize hash links for inodes and dnodes. diff --git a/sys/vfs/isofs/cd9660/cd9660_node.h b/sys/vfs/isofs/cd9660/cd9660_node.h index e1b4d447b6..333887a708 100644 --- a/sys/vfs/isofs/cd9660/cd9660_node.h +++ b/sys/vfs/isofs/cd9660/cd9660_node.h @@ -37,7 +37,7 @@ * * @(#)cd9660_node.h 8.6 (Berkeley) 5/14/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.h,v 1.20 1999/12/29 04:54:37 peter Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.h,v 1.2 2003/06/17 04:28:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.h,v 1.3 2003/08/20 09:56:32 rob Exp $ */ /* @@ -109,19 +109,19 @@ struct vop_reclaim_args; /* * Prototypes for ISOFS vnode operations */ -int cd9660_lookup __P((struct vop_cachedlookup_args *)); -int cd9660_inactive __P((struct vop_inactive_args *)); -int cd9660_reclaim __P((struct vop_reclaim_args *)); -int cd9660_bmap __P((struct vop_bmap_args *)); -int cd9660_blkatoff __P((struct vnode *vp, off_t offset, char **res, struct buf **bpp)); +int cd9660_lookup (struct vop_cachedlookup_args *); +int cd9660_inactive (struct vop_inactive_args *); +int cd9660_reclaim (struct vop_reclaim_args *); +int cd9660_bmap (struct vop_bmap_args *); +int cd9660_blkatoff (struct vnode *vp, off_t offset, char **res, struct buf **bpp); -void cd9660_defattr __P((struct iso_directory_record *, - struct iso_node *, struct buf *, enum ISO_FTYPE)); -void cd9660_deftstamp __P((struct iso_directory_record *, - struct iso_node *, struct buf *, enum ISO_FTYPE)); -struct vnode *cd9660_ihashget __P((dev_t, ino_t)); -void cd9660_ihashins __P((struct iso_node *)); -int cd9660_tstamp_conv7 __P((u_char *, struct timespec *, enum ISO_FTYPE)); -int cd9660_tstamp_conv17 __P((u_char *, struct timespec *)); +void cd9660_defattr (struct iso_directory_record *, + struct iso_node *, struct buf *, enum ISO_FTYPE); +void cd9660_deftstamp (struct iso_directory_record *, + struct iso_node *, struct buf *, enum ISO_FTYPE); +struct vnode *cd9660_ihashget (dev_t, ino_t); +void cd9660_ihashins (struct iso_node *); +int cd9660_tstamp_conv7 (u_char *, struct timespec *, enum ISO_FTYPE); +int cd9660_tstamp_conv17 (u_char *, struct timespec *); #endif /* _KERNEL */ diff --git a/sys/vfs/isofs/cd9660/cd9660_rrip.c b/sys/vfs/isofs/cd9660/cd9660_rrip.c index 63aa404a89..81cc95f26e 100644 --- a/sys/vfs/isofs/cd9660/cd9660_rrip.c +++ b/sys/vfs/isofs/cd9660/cd9660_rrip.c @@ -37,7 +37,7 @@ * * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.17 1999/08/28 00:46:06 peter Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_rrip.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_rrip.c,v 1.6 2003/08/20 09:56:32 rob Exp $ */ #include @@ -52,44 +52,44 @@ #include "cd9660_rrip.h" #include "iso_rrip.h" -typedef int rrt_func_t __P((void *, ISO_RRIP_ANALYZE *ana)); +typedef int rrt_func_t (void *, ISO_RRIP_ANALYZE *ana); typedef struct { char type[2]; rrt_func_t *func; - void (*func2) __P((struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana)); + void (*func2) (struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana); int result; } RRIP_TABLE; -static int cd9660_rrip_altname __P((ISO_RRIP_ALTNAME *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_attr __P((ISO_RRIP_ATTR *p, ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_cont __P((ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana)); -static void cd9660_rrip_defattr __P((struct iso_directory_record *isodir, - ISO_RRIP_ANALYZE *ana)); -static void cd9660_rrip_defname __P((struct iso_directory_record *isodir, - ISO_RRIP_ANALYZE *ana)); -static void cd9660_rrip_deftstamp __P((struct iso_directory_record *isodir, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_device __P((ISO_RRIP_DEVICE *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_extref __P((ISO_RRIP_EXTREF *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_idflag __P((ISO_RRIP_IDFLAG *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_loop __P((struct iso_directory_record *isodir, +static int cd9660_rrip_altname (ISO_RRIP_ALTNAME *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_attr (ISO_RRIP_ATTR *p, ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_cont (ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana); +static void cd9660_rrip_defattr (struct iso_directory_record *isodir, + ISO_RRIP_ANALYZE *ana); +static void cd9660_rrip_defname (struct iso_directory_record *isodir, + ISO_RRIP_ANALYZE *ana); +static void cd9660_rrip_deftstamp (struct iso_directory_record *isodir, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_device (ISO_RRIP_DEVICE *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_extref (ISO_RRIP_EXTREF *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_idflag (ISO_RRIP_IDFLAG *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_loop (struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, - RRIP_TABLE *table)); -static int cd9660_rrip_pclink __P((ISO_RRIP_CLINK *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_reldir __P((ISO_RRIP_RELDIR *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_slink __P((ISO_RRIP_SLINK *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_stop __P((ISO_SUSP_HEADER *p, - ISO_RRIP_ANALYZE *ana)); -static int cd9660_rrip_tstamp __P((ISO_RRIP_TSTAMP *p, - ISO_RRIP_ANALYZE *ana)); + RRIP_TABLE *table); +static int cd9660_rrip_pclink (ISO_RRIP_CLINK *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_reldir (ISO_RRIP_RELDIR *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_slink (ISO_RRIP_SLINK *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_stop (ISO_SUSP_HEADER *p, + ISO_RRIP_ANALYZE *ana); +static int cd9660_rrip_tstamp (ISO_RRIP_TSTAMP *p, + ISO_RRIP_ANALYZE *ana); /* * POSIX file attribute diff --git a/sys/vfs/isofs/cd9660/cd9660_vfsops.c b/sys/vfs/isofs/cd9660/cd9660_vfsops.c index 8414de97bb..48680bd9f7 100644 --- a/sys/vfs/isofs/cd9660/cd9660_vfsops.c +++ b/sys/vfs/isofs/cd9660/cd9660_vfsops.c @@ -37,7 +37,7 @@ * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.74.2.7 2002/04/08 09:39:29 bde Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.9 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.10 2003/08/20 09:56:32 rob Exp $ */ #include @@ -65,16 +65,16 @@ MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure"); MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part"); -static int cd9660_mount __P((struct mount *, - char *, caddr_t, struct nameidata *, struct thread *)); -static int cd9660_unmount __P((struct mount *, int, struct thread *)); -static int cd9660_root __P((struct mount *, struct vnode **)); -static int cd9660_statfs __P((struct mount *, struct statfs *, struct thread *)); -static int cd9660_vget __P((struct mount *, ino_t, struct vnode **)); -static int cd9660_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -static int cd9660_checkexp __P((struct mount *, struct sockaddr *, - int *, struct ucred **)); -static int cd9660_vptofh __P((struct vnode *, struct fid *)); +static int cd9660_mount (struct mount *, + char *, caddr_t, struct nameidata *, struct thread *); +static int cd9660_unmount (struct mount *, int, struct thread *); +static int cd9660_root (struct mount *, struct vnode **); +static int cd9660_statfs (struct mount *, struct statfs *, struct thread *); +static int cd9660_vget (struct mount *, ino_t, struct vnode **); +static int cd9660_fhtovp (struct mount *, struct fid *, struct vnode **); +static int cd9660_checkexp (struct mount *, struct sockaddr *, + int *, struct ucred **); +static int cd9660_vptofh (struct vnode *, struct fid *); static struct vfsops cd9660_vfsops = { cd9660_mount, @@ -100,9 +100,9 @@ MODULE_VERSION(cd9660, 1); * Called by vfs_mountroot when iso is going to be mounted as root. */ -static int iso_get_ssector __P((dev_t dev, struct thread *td)); -static int iso_mountfs __P((struct vnode *devvp, struct mount *mp, - struct thread *td, struct iso_args *argp)); +static int iso_get_ssector (dev_t dev, struct thread *td); +static int iso_mountfs (struct vnode *devvp, struct mount *mp, + struct thread *td, struct iso_args *argp); /* * Try to find the start of the last data track on this CD-ROM. This @@ -136,7 +136,7 @@ iso_get_ssector(dev_t dev, struct thread *td) return ntohl(t.entry.addr.lba); } -static int iso_mountroot __P((struct mount *mp, struct thread *td)); +static int iso_mountroot (struct mount *mp, struct thread *td); static int iso_mountroot(struct mount *mp, struct thread *td) diff --git a/sys/vfs/isofs/cd9660/cd9660_vnops.c b/sys/vfs/isofs/cd9660/cd9660_vnops.c index 8f6d1a6cc7..b71ed47b9b 100644 --- a/sys/vfs/isofs/cd9660/cd9660_vnops.c +++ b/sys/vfs/isofs/cd9660/cd9660_vnops.c @@ -37,7 +37,7 @@ * * @(#)cd9660_vnops.c 8.19 (Berkeley) 5/27/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.62 1999/12/15 23:01:51 eivind Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.6 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.7 2003/08/20 09:56:32 rob Exp $ */ #include @@ -63,22 +63,22 @@ #include "cd9660_node.h" #include "iso_rrip.h" -static int cd9660_setattr __P((struct vop_setattr_args *)); -static int cd9660_access __P((struct vop_access_args *)); -static int cd9660_getattr __P((struct vop_getattr_args *)); -static int cd9660_ioctl __P((struct vop_ioctl_args *)); -static int cd9660_pathconf __P((struct vop_pathconf_args *)); -static int cd9660_read __P((struct vop_read_args *)); +static int cd9660_setattr (struct vop_setattr_args *); +static int cd9660_access (struct vop_access_args *); +static int cd9660_getattr (struct vop_getattr_args *); +static int cd9660_ioctl (struct vop_ioctl_args *); +static int cd9660_pathconf (struct vop_pathconf_args *); +static int cd9660_read (struct vop_read_args *); struct isoreaddir; -static int iso_uiodir __P((struct isoreaddir *idp, struct dirent *dp, - off_t off)); -static int iso_shipdir __P((struct isoreaddir *idp)); -static int cd9660_readdir __P((struct vop_readdir_args *)); -static int cd9660_readlink __P((struct vop_readlink_args *ap)); -static int cd9660_strategy __P((struct vop_strategy_args *)); -static int cd9660_print __P((struct vop_print_args *)); -static int cd9660_getpages __P((struct vop_getpages_args *)); -static int cd9660_putpages __P((struct vop_putpages_args *)); +static int iso_uiodir (struct isoreaddir *idp, struct dirent *dp, + off_t off); +static int iso_shipdir (struct isoreaddir *idp); +static int cd9660_readdir (struct vop_readdir_args *); +static int cd9660_readlink (struct vop_readlink_args *ap); +static int cd9660_strategy (struct vop_strategy_args *); +static int cd9660_print (struct vop_print_args *); +static int cd9660_getpages (struct vop_getpages_args *); +static int cd9660_putpages (struct vop_putpages_args *); /* * Setattr call. Only allowed for block and character special devices. diff --git a/sys/vfs/isofs/cd9660/iso.h b/sys/vfs/isofs/cd9660/iso.h index b94c1fa55d..5f0146cea9 100644 --- a/sys/vfs/isofs/cd9660/iso.h +++ b/sys/vfs/isofs/cd9660/iso.h @@ -37,7 +37,7 @@ * * @(#)iso.h 8.6 (Berkeley) 5/10/95 * $FreeBSD: src/sys/isofs/cd9660/iso.h,v 1.19.2.1 2000/07/08 14:35:56 bp Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/iso.h,v 1.2 2003/06/17 04:28:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/iso.h,v 1.3 2003/08/20 09:56:32 rob Exp $ */ #define ISODCL(from, to) (to - from + 1) @@ -256,21 +256,21 @@ struct iso_mnt { #define lblkno(imp, loc) ((loc) >> (imp)->im_bshift) #define blksize(imp, ip, lbn) ((imp)->logical_block_size) -int cd9660_vget_internal __P((struct mount *, ino_t, struct vnode **, int, - struct iso_directory_record *)); -int cd9660_init __P((struct vfsconf *)); -int cd9660_uninit __P((struct vfsconf *)); -#define cd9660_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \ - size_t, struct proc *)))eopnotsupp) +int cd9660_vget_internal (struct mount *, ino_t, struct vnode **, int, + struct iso_directory_record *); +int cd9660_init (struct vfsconf *); +int cd9660_uninit (struct vfsconf *); +#define cd9660_sysctl ((int (*) (int *, u_int, void *, size_t *, void *, \ + size_t, struct proc *))eopnotsupp) extern vop_t **cd9660_vnodeop_p; extern vop_t **cd9660_specop_p; extern vop_t **cd9660_fifoop_p; -int isochar __P((u_char *, u_char *, int, u_char *)); -int isofncmp __P((u_char *, int, u_char *, int, int)); -void isofntrans __P((u_char *, int, u_char *, u_short *, int, int, int)); -ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *)); +int isochar (u_char *, u_char *, int, u_char *); +int isofncmp (u_char *, int, u_char *, int, int); +void isofntrans (u_char *, int, u_char *, u_short *, int, int, int); +ino_t isodirino (struct iso_directory_record *, struct iso_mnt *); #endif /* _KERNEL */ @@ -279,7 +279,7 @@ ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *)); * outside the kernel. Thus we don't hide them here. */ -static __inline int isonum_711 __P((u_char *)); +static __inline int isonum_711 (u_char *); static __inline int isonum_711(p) u_char *p; @@ -287,7 +287,7 @@ isonum_711(p) return *p; } -static __inline int isonum_712 __P((char *)); +static __inline int isonum_712 (char *); static __inline int isonum_712(p) char *p; @@ -297,7 +297,7 @@ isonum_712(p) #ifndef UNALIGNED_ACCESS -static __inline int isonum_723 __P((u_char *)); +static __inline int isonum_723 (u_char *); static __inline int isonum_723(p) u_char *p; @@ -305,7 +305,7 @@ isonum_723(p) return *p|(p[1] << 8); } -static __inline int isonum_733 __P((u_char *)); +static __inline int isonum_733 (u_char *); static __inline int isonum_733(p) u_char *p; diff --git a/sys/vfs/isofs/cd9660/iso_rrip.h b/sys/vfs/isofs/cd9660/iso_rrip.h index 32de160eb6..8389356fb4 100644 --- a/sys/vfs/isofs/cd9660/iso_rrip.h +++ b/sys/vfs/isofs/cd9660/iso_rrip.h @@ -37,7 +37,7 @@ * * @(#)iso_rrip.h 8.2 (Berkeley) 1/23/94 * $FreeBSD: src/sys/isofs/cd9660/iso_rrip.h,v 1.6 1999/08/28 00:46:07 peter Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/iso_rrip.h,v 1.2 2003/06/17 04:28:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/iso_rrip.h,v 1.3 2003/08/20 09:56:32 rob Exp $ */ @@ -75,13 +75,13 @@ typedef struct { struct iso_directory_record; -int cd9660_rrip_analyze __P((struct iso_directory_record *isodir, - struct iso_node *inop, struct iso_mnt *imp)); -int cd9660_rrip_getname __P((struct iso_directory_record *isodir, +int cd9660_rrip_analyze (struct iso_directory_record *isodir, + struct iso_node *inop, struct iso_mnt *imp); +int cd9660_rrip_getname (struct iso_directory_record *isodir, char *outbuf, u_short *outlen, - ino_t *inump, struct iso_mnt *imp)); -int cd9660_rrip_getsymname __P((struct iso_directory_record *isodir, + ino_t *inump, struct iso_mnt *imp); +int cd9660_rrip_getsymname (struct iso_directory_record *isodir, char *outbuf, u_short *outlen, - struct iso_mnt *imp)); -int cd9660_rrip_offset __P((struct iso_directory_record *isodir, - struct iso_mnt *imp)); + struct iso_mnt *imp); +int cd9660_rrip_offset (struct iso_directory_record *isodir, + struct iso_mnt *imp); diff --git a/sys/vfs/mfs/mfs_extern.h b/sys/vfs/mfs/mfs_extern.h index 48b951d928..aa9c5879fa 100644 --- a/sys/vfs/mfs/mfs_extern.h +++ b/sys/vfs/mfs/mfs_extern.h @@ -32,7 +32,7 @@ * * @(#)mfs_extern.h 8.4 (Berkeley) 3/30/95 * $FreeBSD: src/sys/ufs/mfs/mfs_extern.h,v 1.15 1999/08/28 00:52:24 peter Exp $ - * $DragonFly: src/sys/vfs/mfs/mfs_extern.h,v 1.3 2003/06/25 03:56:12 dillon Exp $ + * $DragonFly: src/sys/vfs/mfs/mfs_extern.h,v 1.4 2003/08/20 09:56:32 rob Exp $ */ #ifndef _UFS_MFS_MFS_EXTERN_H_ @@ -44,9 +44,9 @@ struct mount; struct thread; struct vnode; -void mfs_doio __P((struct buf *bp, struct mfsnode *mfsnode)); -u_char *mfs_getimage __P((void)); -int mfs_mountfs __P((struct vnode *, struct mount *, struct thread *)); -int mfs_mountroot __P((void)); +void mfs_doio (struct buf *bp, struct mfsnode *mfsnode); +u_char *mfs_getimage (void); +int mfs_mountfs (struct vnode *, struct mount *, struct thread *); +int mfs_mountroot (void); #endif /* !_UFS_MFS_MFS_EXTERN_H_ */ diff --git a/sys/vfs/mfs/mfs_vfsops.c b/sys/vfs/mfs/mfs_vfsops.c index d5f9d9ebea..8caf8cd429 100644 --- a/sys/vfs/mfs/mfs_vfsops.c +++ b/sys/vfs/mfs/mfs_vfsops.c @@ -32,7 +32,7 @@ * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 * $FreeBSD: src/sys/ufs/mfs/mfs_vfsops.c,v 1.81.2.3 2001/07/04 17:35:21 tegge Exp $ - * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.10 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.11 2003/08/20 09:56:32 rob Exp $ */ @@ -69,13 +69,13 @@ static int mfs_minor; /* used for building internal dev_t */ extern vop_t **mfs_vnodeop_p; -static int mfs_mount __P((struct mount *mp, +static int mfs_mount (struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, - struct thread *td)); -static int mfs_start __P((struct mount *mp, int flags, struct thread *td)); -static int mfs_statfs __P((struct mount *mp, struct statfs *sbp, - struct thread *td)); -static int mfs_init __P((struct vfsconf *)); + struct thread *td); +static int mfs_start (struct mount *mp, int flags, struct thread *td); +static int mfs_statfs (struct mount *mp, struct statfs *sbp, + struct thread *td); +static int mfs_init (struct vfsconf *); #define MFS_CDEV_MAJOR 253 diff --git a/sys/vfs/mfs/mfs_vnops.c b/sys/vfs/mfs/mfs_vnops.c index e36d737009..bd4e7ef974 100644 --- a/sys/vfs/mfs/mfs_vnops.c +++ b/sys/vfs/mfs/mfs_vnops.c @@ -32,7 +32,7 @@ * * @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95 * $FreeBSD: src/sys/ufs/mfs/mfs_vnops.c,v 1.47.2.1 2001/05/22 02:06:43 bp Exp $ - * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.9 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.10 2003/08/20 09:56:32 rob Exp $ */ #include @@ -51,17 +51,17 @@ #include "mfsnode.h" #include "mfs_extern.h" -static int mfs_badop __P((struct vop_generic_args *)); -static int mfs_bmap __P((struct vop_bmap_args *)); -static int mfs_close __P((struct vop_close_args *)); -static int mfs_fsync __P((struct vop_fsync_args *)); -static int mfs_freeblks __P((struct vop_freeblks_args *)); -static int mfs_inactive __P((struct vop_inactive_args *)); /* XXX */ -static int mfs_open __P((struct vop_open_args *)); -static int mfs_reclaim __P((struct vop_reclaim_args *)); /* XXX */ -static int mfs_print __P((struct vop_print_args *)); /* XXX */ -static int mfs_strategy __P((struct vop_strategy_args *)); /* XXX */ -static int mfs_getpages __P((struct vop_getpages_args *)); /* XXX */ +static int mfs_badop (struct vop_generic_args *); +static int mfs_bmap (struct vop_bmap_args *); +static int mfs_close (struct vop_close_args *); +static int mfs_fsync (struct vop_fsync_args *); +static int mfs_freeblks (struct vop_freeblks_args *); +static int mfs_inactive (struct vop_inactive_args *); /* XXX */ +static int mfs_open (struct vop_open_args *); +static int mfs_reclaim (struct vop_reclaim_args *); /* XXX */ +static int mfs_print (struct vop_print_args *); /* XXX */ +static int mfs_strategy (struct vop_strategy_args *); /* XXX */ +static int mfs_getpages (struct vop_getpages_args *); /* XXX */ /* * mfs vnode operations. */ diff --git a/sys/vfs/msdosfs/denode.h b/sys/vfs/msdosfs/denode.h index 7bd77d5efc..7315e785d7 100644 --- a/sys/vfs/msdosfs/denode.h +++ b/sys/vfs/msdosfs/denode.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/denode.h,v 1.20 1999/12/29 04:54:52 peter Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/denode.h,v 1.4 2003/06/26 05:55:17 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/denode.h,v 1.5 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $ */ /*- @@ -262,26 +262,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)); -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 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); +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 thread *td); +int doscheckpath ( struct denode *source, struct denode *target); #endif /* _KERNEL */ diff --git a/sys/vfs/msdosfs/direntry.h b/sys/vfs/msdosfs/direntry.h index dea4053de9..62c9e2ce0f 100644 --- a/sys/vfs/msdosfs/direntry.h +++ b/sys/vfs/msdosfs/direntry.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/direntry.h,v 1.15 1999/12/29 04:54:52 peter Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/direntry.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/direntry.h,v 1.3 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $ */ /*- @@ -130,15 +130,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/vfs/msdosfs/fat.h b/sys/vfs/msdosfs/fat.h index f6ee7a7906..9ca66a0e5b 100644 --- a/sys/vfs/msdosfs/fat.h +++ b/sys/vfs/msdosfs/fat.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/fat.h,v 1.9 1999/12/29 04:54:53 peter Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/fat.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/fat.h,v 1.3 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $ */ /*- @@ -98,12 +98,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/vfs/msdosfs/msdosfs_conv.c b/sys/vfs/msdosfs/msdosfs_conv.c index 036deb4501..e53701da35 100644 --- a/sys/vfs/msdosfs/msdosfs_conv.c +++ b/sys/vfs/msdosfs/msdosfs_conv.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_conv.c,v 1.29.2.1 2002/11/08 22:01:22 semenu Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_conv.c,v 1.3 2003/08/07 21:17:41 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_conv.c,v 1.4 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */ /*- @@ -89,7 +89,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/vfs/msdosfs/msdosfs_denode.c b/sys/vfs/msdosfs/msdosfs_denode.c index 34cf3b566c..45c4f2c796 100644 --- a/sys/vfs/msdosfs/msdosfs_denode.c +++ b/sys/vfs/msdosfs/msdosfs_denode.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_denode.c,v 1.47.2.3 2002/08/22 16:20:15 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.8 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- @@ -93,10 +93,10 @@ 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/vfs/msdosfs/msdosfs_fat.c b/sys/vfs/msdosfs/msdosfs_fat.c index b245f9d176..bcb56e8966 100644 --- a/sys/vfs/msdosfs/msdosfs_fat.c +++ b/sys/vfs/msdosfs/msdosfs_fat.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_fat.c,v 1.23 2000/01/27 14:43:06 nyan Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_fat.c,v 1.4 2003/08/07 21:17:41 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_fat.c,v 1.5 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */ /*- @@ -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/vfs/msdosfs/msdosfs_vfsops.c b/sys/vfs/msdosfs/msdosfs_vfsops.c index 3635410179..4c48ddc440 100644 --- a/sys/vfs/msdosfs/msdosfs_vfsops.c +++ b/sys/vfs/msdosfs/msdosfs_vfsops.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_vfsops.c,v 1.60.2.6 2002/09/12 21:33:38 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.8 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -86,21 +86,21 @@ 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_checkexp __P((struct mount *, struct sockaddr *, - int *, struct ucred **)); -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 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_checkexp (struct mount *, struct sockaddr *, + int *, struct ucred **); +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 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/vfs/msdosfs/msdosfs_vnops.c b/sys/vfs/msdosfs/msdosfs_vnops.c index f3411a87c2..67e1f8a18e 100644 --- a/sys/vfs/msdosfs/msdosfs_vnops.c +++ b/sys/vfs/msdosfs/msdosfs_vnops.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.10 2003/08/07 21:17:41 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.11 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -82,28 +82,28 @@ /* * 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_getpages __P((struct vop_getpages_args *)); -static int msdosfs_putpages __P((struct vop_putpages_args *)); +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); +static int msdosfs_getpages (struct vop_getpages_args *); +static int msdosfs_putpages (struct vop_putpages_args *); /* * Some general notes: diff --git a/sys/vfs/msdosfs/msdosfsmount.h b/sys/vfs/msdosfs/msdosfsmount.h index c24ac88dcb..4b2b1334e5 100644 --- a/sys/vfs/msdosfs/msdosfsmount.h +++ b/sys/vfs/msdosfs/msdosfsmount.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfsmount.h,v 1.20.2.2 2000/10/27 09:45:07 bde Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfsmount.h,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfsmount.h,v 1.3 2003/08/20 09:56:32 rob Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $ */ /*- @@ -198,9 +198,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/vfs/nfs/krpc.h b/sys/vfs/nfs/krpc.h index 786ff2003e..070bdaaae3 100644 --- a/sys/vfs/nfs/krpc.h +++ b/sys/vfs/nfs/krpc.h @@ -1,6 +1,6 @@ /* $NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $ */ /* $FreeBSD: src/sys/nfs/krpc.h,v 1.6 1999/08/28 00:49:55 peter Exp $ */ -/* $DragonFly: src/sys/vfs/nfs/krpc.h,v 1.3 2003/06/25 03:56:07 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/nfs/krpc.h,v 1.4 2003/08/20 09:56:32 rob Exp $ */ #include @@ -10,14 +10,14 @@ struct thread; struct sockaddr; struct sockaddr_in; -int krpc_call __P((struct sockaddr_in *_sin, +int krpc_call (struct sockaddr_in *_sin, u_int prog, u_int vers, u_int func, - struct mbuf **data, struct sockaddr **from, struct thread *td)); + struct mbuf **data, struct sockaddr **from, struct thread *td); -int krpc_portmap __P((struct sockaddr_in *_sin, - u_int prog, u_int vers, u_int16_t *portp,struct thread *td)); +int krpc_portmap (struct sockaddr_in *_sin, + u_int prog, u_int vers, u_int16_t *portp,struct thread *td); -struct mbuf *xdr_string_encode __P((char *str, int len)); +struct mbuf *xdr_string_encode (char *str, int len); /* * RPC definitions for the portmapper diff --git a/sys/vfs/nfs/nfs.h b/sys/vfs/nfs/nfs.h index 8dc0fe8da5..8b002d5779 100644 --- a/sys/vfs/nfs/nfs.h +++ b/sys/vfs/nfs/nfs.h @@ -35,7 +35,7 @@ * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 * $FreeBSD: src/sys/nfs/nfs.h,v 1.53.2.5 2002/02/20 01:35:34 iedowse Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs.h,v 1.4 2003/06/26 05:55:18 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs.h,v 1.5 2003/08/20 09:56:32 rob Exp $ */ #ifndef _NFS_NFS_H_ @@ -577,150 +577,150 @@ extern int nfs_debug; #endif -u_quad_t nfs_curusec __P((void)); -int nfs_init __P((struct vfsconf *vfsp)); -int nfs_uninit __P((struct vfsconf *vfsp)); -int nfs_reply __P((struct nfsreq *)); -int nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int)); -int nfs_send __P((struct socket *, struct sockaddr *, struct mbuf *, - struct nfsreq *)); -int nfs_rephead __P((int, struct nfsrv_descript *, struct nfssvc_sock *, +u_quad_t nfs_curusec (void); +int nfs_init (struct vfsconf *vfsp); +int nfs_uninit (struct vfsconf *vfsp); +int nfs_reply (struct nfsreq *); +int nfs_getreq (struct nfsrv_descript *,struct nfsd *,int); +int nfs_send (struct socket *, struct sockaddr *, struct mbuf *, + struct nfsreq *); +int nfs_rephead (int, struct nfsrv_descript *, struct nfssvc_sock *, int, int, u_quad_t *, struct mbuf **, struct mbuf **, - caddr_t *)); -int nfs_sndlock __P((struct nfsreq *)); -void nfs_sndunlock __P((struct nfsreq *)); -int nfs_slplock __P((struct nfssvc_sock *, int)); -void nfs_slpunlock __P((struct nfssvc_sock *)); -int nfs_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *)); -int nfs_vinvalbuf __P((struct vnode *, int, struct thread *, int)); -int nfs_readrpc __P((struct vnode *, struct uio *)); -int nfs_writerpc __P((struct vnode *, struct uio *, int *, int *)); -int nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt, - struct thread *td)); -int nfs_readdirrpc __P((struct vnode *, struct uio *)); -int nfs_asyncio __P((struct buf *, struct thread *)); -int nfs_doio __P((struct buf *, struct thread *)); -int nfs_readlinkrpc __P((struct vnode *, struct uio *)); -int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct thread *)); -int nfs_readdirplusrpc __P((struct vnode *, struct uio *)); -int nfsm_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *)); -void nfsm_srvfattr __P((struct nfsrv_descript *, struct vattr *, - struct nfs_fattr *)); -void nfsm_srvwcc __P((struct nfsrv_descript *, int, struct vattr *, int, - struct vattr *, struct mbuf **, char **)); -void nfsm_srvpostopattr __P((struct nfsrv_descript *, int, struct vattr *, - struct mbuf **, char **)); -int netaddr_match __P((int, union nethostaddr *, struct sockaddr *)); -int nfs_request __P((struct vnode *, struct mbuf *, int, struct thread *, + caddr_t *); +int nfs_sndlock (struct nfsreq *); +void nfs_sndunlock (struct nfsreq *); +int nfs_slplock (struct nfssvc_sock *, int); +void nfs_slpunlock (struct nfssvc_sock *); +int nfs_disct (struct mbuf **, caddr_t *, int, int, caddr_t *); +int nfs_vinvalbuf (struct vnode *, int, struct thread *, int); +int nfs_readrpc (struct vnode *, struct uio *); +int nfs_writerpc (struct vnode *, struct uio *, int *, int *); +int nfs_commit (struct vnode *vp, u_quad_t offset, int cnt, + struct thread *td); +int nfs_readdirrpc (struct vnode *, struct uio *); +int nfs_asyncio (struct buf *, struct thread *); +int nfs_doio (struct buf *, struct thread *); +int nfs_readlinkrpc (struct vnode *, struct uio *); +int nfs_sigintr (struct nfsmount *, struct nfsreq *, struct thread *); +int nfs_readdirplusrpc (struct vnode *, struct uio *); +int nfsm_disct (struct mbuf **, caddr_t *, int, int, caddr_t *); +void nfsm_srvfattr (struct nfsrv_descript *, struct vattr *, + struct nfs_fattr *); +void nfsm_srvwcc (struct nfsrv_descript *, int, struct vattr *, int, + struct vattr *, struct mbuf **, char **); +void nfsm_srvpostopattr (struct nfsrv_descript *, int, struct vattr *, + struct mbuf **, char **); +int netaddr_match (int, union nethostaddr *, struct sockaddr *); +int nfs_request (struct vnode *, struct mbuf *, int, struct thread *, struct ucred *, struct mbuf **, struct mbuf **, - caddr_t *)); -int nfs_loadattrcache __P((struct vnode **, struct mbuf **, caddr_t *, - struct vattr *, int)); -int nfs_namei __P((struct nameidata *, fhandle_t *, int, + caddr_t *); +int nfs_loadattrcache (struct vnode **, struct mbuf **, caddr_t *, + struct vattr *, int); +int nfs_namei (struct nameidata *, fhandle_t *, int, struct nfssvc_sock *, struct sockaddr *, struct mbuf **, - caddr_t *, struct vnode **, struct thread *, int, int)); -void nfsm_adj __P((struct mbuf *, int, int)); -int nfsm_mbuftouio __P((struct mbuf **, struct uio *, int, caddr_t *)); -void nfsrv_initcache __P((void)); -int nfs_getauth __P((struct nfsmount *, struct nfsreq *, struct ucred *, - char **, int *, char *, int *, NFSKERBKEY_T)); -int nfs_getnickauth __P((struct nfsmount *, struct ucred *, char **, - int *, char *, int)); -int nfs_savenickauth __P((struct nfsmount *, struct ucred *, int, + caddr_t *, struct vnode **, struct thread *, int, int); +void nfsm_adj (struct mbuf *, int, int); +int nfsm_mbuftouio (struct mbuf **, struct uio *, int, caddr_t *); +void nfsrv_initcache (void); +int nfs_getauth (struct nfsmount *, struct nfsreq *, struct ucred *, + char **, int *, char *, int *, NFSKERBKEY_T); +int nfs_getnickauth (struct nfsmount *, struct ucred *, char **, + int *, char *, int); +int nfs_savenickauth (struct nfsmount *, struct ucred *, int, NFSKERBKEY_T, struct mbuf **, char **, - struct mbuf *)); -int nfs_adv __P((struct mbuf **, caddr_t *, int, int)); -void nfs_nhinit __P((void)); -int nfs_nmcancelreqs __P((struct nfsmount *)); -void nfs_timer __P((void*)); -int nfsrv_dorec __P((struct nfssvc_sock *, struct nfsd *, - struct nfsrv_descript **)); -int nfsrv_getcache __P((struct nfsrv_descript *, struct nfssvc_sock *, - struct mbuf **)); -void nfsrv_updatecache __P((struct nfsrv_descript *, int, struct mbuf *)); -void nfsrv_cleancache __P((void)); -int nfs_connect __P((struct nfsmount *, struct nfsreq *)); -void nfs_disconnect __P((struct nfsmount *)); -void nfs_safedisconnect __P((struct nfsmount *)); -int nfs_getattrcache __P((struct vnode *, struct vattr *)); -int nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long)); -int nfs_bioread __P((struct vnode *, struct uio *, int)); -int nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *)); -void nfsrv_init __P((int)); -void nfs_clearcommit __P((struct mount *)); -int nfsrv_errmap __P((struct nfsrv_descript *, int)); -void nfsrvw_sort __P((gid_t *, int)); -void nfsrv_setcred __P((struct ucred *, struct ucred *)); -int nfs_writebp __P((struct buf *, int, struct thread *)); -int nfsrv_object_create __P((struct vnode *)); -void nfsrv_wakenfsd __P((struct nfssvc_sock *slp)); -int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *, - struct thread *, struct mbuf **)); -int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct thread *p)); - -int nfsrv3_access __P((struct nfsrv_descript *nfsd, + struct mbuf *); +int nfs_adv (struct mbuf **, caddr_t *, int, int); +void nfs_nhinit (void); +int nfs_nmcancelreqs (struct nfsmount *); +void nfs_timer (void*); +int nfsrv_dorec (struct nfssvc_sock *, struct nfsd *, + struct nfsrv_descript **); +int nfsrv_getcache (struct nfsrv_descript *, struct nfssvc_sock *, + struct mbuf **); +void nfsrv_updatecache (struct nfsrv_descript *, int, struct mbuf *); +void nfsrv_cleancache (void); +int nfs_connect (struct nfsmount *, struct nfsreq *); +void nfs_disconnect (struct nfsmount *); +void nfs_safedisconnect (struct nfsmount *); +int nfs_getattrcache (struct vnode *, struct vattr *); +int nfsm_strtmbuf (struct mbuf **, char **, const char *, long); +int nfs_bioread (struct vnode *, struct uio *, int); +int nfsm_uiotombuf (struct uio *, struct mbuf **, int, caddr_t *); +void nfsrv_init (int); +void nfs_clearcommit (struct mount *); +int nfsrv_errmap (struct nfsrv_descript *, int); +void nfsrvw_sort (gid_t *, int); +void nfsrv_setcred (struct ucred *, struct ucred *); +int nfs_writebp (struct buf *, int, struct thread *); +int nfsrv_object_create (struct vnode *); +void nfsrv_wakenfsd (struct nfssvc_sock *slp); +int nfsrv_writegather (struct nfsrv_descript **, struct nfssvc_sock *, + struct thread *, struct mbuf **); +int nfs_fsinfo (struct nfsmount *, struct vnode *, struct thread *p); + +int nfsrv3_access (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_fhtovp __P((fhandle_t *, int, struct vnode **, struct ucred *, + struct thread *td, struct mbuf **mrq); +int nfsrv_commit (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_create (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_fhtovp (fhandle_t *, int, struct vnode **, struct ucred *, struct nfssvc_sock *, struct sockaddr *, int *, - int, int)); -int nfsrv_setpublicfs __P((struct mount *, struct netexport *, - struct export_args *)); -int nfs_ispublicfh __P((fhandle_t *)); -int nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_pathconf __P((struct nfsrv_descript *nfsd, + int, int); +int nfsrv_setpublicfs (struct mount *, struct netexport *, + struct export_args *); +int nfs_ispublicfh (fhandle_t *); +int nfsrv_fsinfo (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_getattr (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_link (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_lookup (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_mkdir (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_mknod (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_noop (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_null (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_pathconf (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct thread *td, - struct mbuf **mrq)); -int nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_readdir __P((struct nfsrv_descript *nfsd, + struct mbuf **mrq); +int nfsrv_read (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_readdir (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_readdirplus __P((struct nfsrv_descript *nfsd, + struct thread *td, struct mbuf **mrq); +int nfsrv_readdirplus (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct thread *td, - struct mbuf **mrq)); -int nfsrv_readlink __P((struct nfsrv_descript *nfsd, + struct mbuf **mrq); +int nfsrv_readlink (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct thread *td, - struct mbuf **mrq)); -int nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_setattr __P((struct nfsrv_descript *nfsd, + struct mbuf **mrq); +int nfsrv_remove (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_rename (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_rmdir (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +int nfsrv_setattr (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_statfs __P((struct nfsrv_descript *nfsd, + struct thread *td, struct mbuf **mrq); +int nfsrv_statfs (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_symlink __P((struct nfsrv_descript *nfsd, + struct thread *td, struct mbuf **mrq); +int nfsrv_symlink (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, - struct thread *td, struct mbuf **mrq)); -void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag)); -void nfsrv_slpderef __P((struct nfssvc_sock *slp)); -int nfs_meta_setsize __P((struct vnode *vp, struct thread *td, u_quad_t nsize)); + struct thread *td, struct mbuf **mrq); +int nfsrv_write (struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, + struct thread *td, struct mbuf **mrq); +void nfsrv_rcv (struct socket *so, void *arg, int waitflag); +void nfsrv_slpderef (struct nfssvc_sock *slp); +int nfs_meta_setsize (struct vnode *vp, struct thread *td, u_quad_t nsize); #endif /* _KERNEL */ diff --git a/sys/vfs/nfs/nfs_bio.c b/sys/vfs/nfs/nfs_bio.c index 28c56223d3..55de0b7826 100644 --- a/sys/vfs/nfs/nfs_bio.c +++ b/sys/vfs/nfs/nfs_bio.c @@ -35,7 +35,7 @@ * * @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_bio.c,v 1.83.2.4 2002/12/29 18:19:53 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.10 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.11 2003/08/20 09:56:33 rob Exp $ */ @@ -65,8 +65,8 @@ #include "nqnfs.h" #include "nfsnode.h" -static struct buf *nfs_getcacheblk __P((struct vnode *vp, daddr_t bn, int size, - struct thread *td)); +static struct buf *nfs_getcacheblk (struct vnode *vp, daddr_t bn, int size, + struct thread *td); extern int nfs_numasync; extern int nfs_pbuf_freecnt; diff --git a/sys/vfs/nfs/nfs_nqlease.c b/sys/vfs/nfs/nfs_nqlease.c index a4ef83e9ea..ffd7b22e13 100644 --- a/sys/vfs/nfs/nfs_nqlease.c +++ b/sys/vfs/nfs/nfs_nqlease.c @@ -35,7 +35,7 @@ * * @(#)nfs_nqlease.c 8.9 (Berkeley) 5/20/95 * $FreeBSD: src/sys/nfs/nfs_nqlease.c,v 1.50 2000/02/13 03:32:05 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.8 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.9 2003/08/20 09:56:33 rob Exp $ */ @@ -89,21 +89,21 @@ static int nqsrv_maxnumlease = NQ_MAXNUMLEASE; struct vop_lease_args; #ifndef NFS_NOSERVER -static int nqsrv_cmpnam __P((struct nfssvc_sock *, struct sockaddr *, - struct nqhost *)); -static int nqnfs_vacated __P((struct vnode *vp, struct ucred *cred)); -static void nqsrv_addhost __P((struct nqhost *lph, struct nfssvc_sock *slp, - struct sockaddr *nam)); -static void nqsrv_instimeq __P((struct nqlease *lp, u_int32_t duration)); -static void nqsrv_locklease __P((struct nqlease *lp)); -static void nqsrv_send_eviction __P((struct vnode *vp, struct nqlease *lp, +static int nqsrv_cmpnam (struct nfssvc_sock *, struct sockaddr *, + struct nqhost *); +static int nqnfs_vacated (struct vnode *vp, struct ucred *cred); +static void nqsrv_addhost (struct nqhost *lph, struct nfssvc_sock *slp, + struct sockaddr *nam); +static void nqsrv_instimeq (struct nqlease *lp, u_int32_t duration); +static void nqsrv_locklease (struct nqlease *lp); +static void nqsrv_send_eviction (struct vnode *vp, struct nqlease *lp, struct nfssvc_sock *slp, struct sockaddr *nam, - struct ucred *cred)); -static void nqsrv_unlocklease __P((struct nqlease *lp)); -static void nqsrv_waitfor_expiry __P((struct nqlease *lp)); + struct ucred *cred); +static void nqsrv_unlocklease (struct nqlease *lp); +static void nqsrv_waitfor_expiry (struct nqlease *lp); #endif -extern void nqnfs_lease_updatetime __P((int deltat)); +extern void nqnfs_lease_updatetime (int deltat); /* * Signifies which rpcs can have piggybacked lease requests diff --git a/sys/vfs/nfs/nfs_serv.c b/sys/vfs/nfs/nfs_serv.c index 2ea354b54d..657f85aff1 100644 --- a/sys/vfs/nfs/nfs_serv.c +++ b/sys/vfs/nfs/nfs_serv.c @@ -35,7 +35,7 @@ * * @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95 * $FreeBSD: src/sys/nfs/nfs_serv.c,v 1.93.2.6 2002/12/29 18:19:53 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.8 2003/08/20 09:56:33 rob Exp $ */ /* @@ -147,10 +147,10 @@ static int nfs_commit_miss; SYSCTL_INT(_vfs_nfs, OID_AUTO, commit_blks, CTLFLAG_RW, &nfs_commit_blks, 0, ""); SYSCTL_INT(_vfs_nfs, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss, 0, ""); -static int nfsrv_access __P((struct vnode *,int,struct ucred *,int, - struct thread *, int)); -static void nfsrvw_coalesce __P((struct nfsrv_descript *, - struct nfsrv_descript *)); +static int nfsrv_access (struct vnode *,int,struct ucred *,int, + struct thread *, int); +static void nfsrvw_coalesce (struct nfsrv_descript *, + struct nfsrv_descript *); /* * Clear nameidata fields that are tested in nsfmout cleanup code prior diff --git a/sys/vfs/nfs/nfs_socket.c b/sys/vfs/nfs/nfs_socket.c index 5a7c1a4eca..a93eb1b70f 100644 --- a/sys/vfs/nfs/nfs_socket.c +++ b/sys/vfs/nfs/nfs_socket.c @@ -35,7 +35,7 @@ * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_socket.c,v 1.60.2.6 2003/03/26 01:44:46 alfred Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.8 2003/08/20 09:56:33 rob Exp $ */ /* @@ -149,21 +149,21 @@ int nfsrtton = 0; struct nfsrtt nfsrtt; struct callout_handle nfs_timer_handle; -static int nfs_msg __P((struct thread *,char *,char *)); -static int nfs_rcvlock __P((struct nfsreq *)); -static void nfs_rcvunlock __P((struct nfsreq *)); -static void nfs_realign __P((struct mbuf **pm, int hsiz)); -static int nfs_receive __P((struct nfsreq *rep, struct sockaddr **aname, - struct mbuf **mp)); -static void nfs_softterm __P((struct nfsreq *rep)); -static int nfs_reconnect __P((struct nfsreq *rep)); +static int nfs_msg (struct thread *,char *,char *); +static int nfs_rcvlock (struct nfsreq *); +static void nfs_rcvunlock (struct nfsreq *); +static void nfs_realign (struct mbuf **pm, int hsiz); +static int nfs_receive (struct nfsreq *rep, struct sockaddr **aname, + struct mbuf **mp); +static void nfs_softterm (struct nfsreq *rep); +static int nfs_reconnect (struct nfsreq *rep); #ifndef NFS_NOSERVER -static int nfsrv_getstream __P((struct nfssvc_sock *,int)); +static int nfsrv_getstream (struct nfssvc_sock *,int); -int (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *nd, +int (*nfsrv3_procs[NFS_NPROCS]) (struct nfsrv_descript *nd, struct nfssvc_sock *slp, struct thread *td, - struct mbuf **mreqp)) = { + struct mbuf **mreqp) = { nfsrv_null, nfsrv_getattr, nfsrv_setattr, diff --git a/sys/vfs/nfs/nfs_subs.c b/sys/vfs/nfs/nfs_subs.c index f74c3dcc66..09b160a5cd 100644 --- a/sys/vfs/nfs/nfs_subs.c +++ b/sys/vfs/nfs/nfs_subs.c @@ -35,7 +35,7 @@ * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 * $FreeBSD: src/sys/nfs/nfs_subs.c,v 1.90.2.2 2001/10/25 19:18:53 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.8 2003/08/20 09:56:33 rob Exp $ */ /* @@ -110,7 +110,7 @@ struct nqtimerhead nqtimerhead; struct nqfhhashhead *nqfhhashtbl; u_long nqfhhash; -static void (*nfs_prev_lease_updatetime) __P((int)); +static void (*nfs_prev_lease_updatetime) (int); static int nfs_prev_nfssvc_sy_narg; static sy_call_t *nfs_prev_nfssvc_sy_call; @@ -561,7 +561,7 @@ extern int nfssvc(struct proc *, struct nfssvc_args *, int *); LIST_HEAD(nfsnodehashhead, nfsnode); -int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *)); +int nfs_webnamei (struct nameidata *, struct vnode *, struct proc *); u_quad_t nfs_curusec() diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c index 33e94329dd..823fec6511 100644 --- a/sys/vfs/nfs/nfs_syscalls.c +++ b/sys/vfs/nfs/nfs_syscalls.c @@ -35,7 +35,7 @@ * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_syscalls.c,v 1.58.2.1 2000/11/26 02:30:06 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.8 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.9 2003/08/20 09:56:33 rob Exp $ */ #include @@ -74,10 +74,10 @@ static MALLOC_DEFINE(M_NFSSVC, "NFS srvsock", "Nfs server structure"); /* Global defs. */ -extern int32_t (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *nd, +extern int32_t (*nfsrv3_procs[NFS_NPROCS]) (struct nfsrv_descript *nd, struct nfssvc_sock *slp, struct thread *td, - struct mbuf **mreqp)); + struct mbuf **mreqp); extern int nfs_numasync; extern time_t nqnfsstarttime; extern int nqsrv_writeslack; @@ -88,9 +88,9 @@ extern int nfsrvw_procrastinate_v3; static int nuidhash_max = NFS_MAXUIDHASH; #ifndef NFS_NOSERVER -static void nfsrv_zapsock __P((struct nfssvc_sock *slp)); +static void nfsrv_zapsock (struct nfssvc_sock *slp); #endif -static int nfssvc_iod __P((struct thread *)); +static int nfssvc_iod (struct thread *); #define TRUE 1 #define FALSE 0 @@ -105,11 +105,11 @@ static struct nfsdrt nfsdrt; static int nfs_numnfsd = 0; static int notstarted = 1; static int modify_flag = 0; -static void nfsd_rt __P((int sotype, struct nfsrv_descript *nd, - int cacherep)); -static int nfssvc_addsock __P((struct file *, struct sockaddr *, - struct thread *)); -static int nfssvc_nfsd __P((struct nfsd_srvargs *,caddr_t,struct thread *)); +static void nfsd_rt (int sotype, struct nfsrv_descript *nd, + int cacherep); +static int nfssvc_addsock (struct file *, struct sockaddr *, + struct thread *); +static int nfssvc_nfsd (struct nfsd_srvargs *,caddr_t,struct thread *); static int nfs_privport = 0; SYSCTL_INT(_vfs_nfs, NFS_NFSPRIVPORT, nfs_privport, CTLFLAG_RW, &nfs_privport, 0, ""); diff --git a/sys/vfs/nfs/nfs_vfsops.c b/sys/vfs/nfs/nfs_vfsops.c index 2eabf7f202..043b69e5af 100644 --- a/sys/vfs/nfs/nfs_vfsops.c +++ b/sys/vfs/nfs/nfs_vfsops.c @@ -35,7 +35,7 @@ * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 * $FreeBSD: src/sys/nfs/nfs_vfsops.c,v 1.91.2.7 2003/01/27 20:04:08 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_vfsops.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_vfsops.c,v 1.8 2003/08/20 09:56:33 rob Exp $ */ #include "opt_bootp.h" @@ -71,7 +71,7 @@ #include "nfsdiskless.h" #include "nqnfs.h" -extern int nfs_mountroot __P((struct mount *mp)); +extern int nfs_mountroot (struct mount *mp); extern int nfs_ticks; @@ -98,20 +98,20 @@ int nfs_debug; SYSCTL_INT(_vfs_nfs, OID_AUTO, debug, CTLFLAG_RW, &nfs_debug, 0, ""); #endif -static int nfs_iosize __P((struct nfsmount *nmp)); -static void nfs_decode_args __P((struct nfsmount *nmp, - struct nfs_args *argp)); -static int mountnfs __P((struct nfs_args *,struct mount *, - struct sockaddr *,char *,char *,struct vnode **)); -static int nfs_mount __P(( struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td)); -static int nfs_unmount __P(( struct mount *mp, int mntflags, - struct thread *td)); -static int nfs_root __P(( struct mount *mp, struct vnode **vpp)); -static int nfs_statfs __P(( struct mount *mp, struct statfs *sbp, - struct thread *td)); -static int nfs_sync __P(( struct mount *mp, int waitfor, - struct thread *td)); +static int nfs_iosize (struct nfsmount *nmp); +static void nfs_decode_args (struct nfsmount *nmp, + struct nfs_args *argp); +static int mountnfs (struct nfs_args *,struct mount *, + struct sockaddr *,char *,char *,struct vnode **); +static int nfs_mount ( struct mount *mp, char *path, caddr_t data, + struct nameidata *ndp, struct thread *td); +static int nfs_unmount ( struct mount *mp, int mntflags, + struct thread *td); +static int nfs_root ( struct mount *mp, struct vnode **vpp); +static int nfs_statfs ( struct mount *mp, struct statfs *sbp, + struct thread *td); +static int nfs_sync ( struct mount *mp, int waitfor, + struct thread *td); /* * nfs vfs operations. @@ -161,14 +161,14 @@ SYSCTL_OPAQUE(_vfs_nfs, OID_AUTO, diskless_swapaddr, CTLFLAG_RD, "%Ssockaddr_in",""); -void nfsargs_ntoh __P((struct nfs_args *)); -static int nfs_mountdiskless __P((char *, char *, int, +void nfsargs_ntoh (struct nfs_args *); +static int nfs_mountdiskless (char *, char *, int, struct sockaddr_in *, struct nfs_args *, struct thread *, struct vnode **, - struct mount **)); -static void nfs_convert_diskless __P((void)); -static void nfs_convert_oargs __P((struct nfs_args *args, - struct onfs_args *oargs)); + struct mount **); +static void nfs_convert_diskless (void); +static void nfs_convert_oargs (struct nfs_args *args, + struct onfs_args *oargs); static int nfs_iosize(nmp) diff --git a/sys/vfs/nfs/nfs_vnops.c b/sys/vfs/nfs/nfs_vnops.c index 4eb0bb7570..3dbc1afd67 100644 --- a/sys/vfs/nfs/nfs_vnops.c +++ b/sys/vfs/nfs/nfs_vnops.c @@ -35,7 +35,7 @@ * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 * $FreeBSD: src/sys/nfs/nfs_vnops.c,v 1.150.2.5 2001/12/20 19:56:28 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.10 2003/08/08 21:42:06 drhodus Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.11 2003/08/20 09:56:33 rob Exp $ */ @@ -98,43 +98,43 @@ #define vfs_busy_pages(bp, f) #endif -static int nfsspec_read __P((struct vop_read_args *)); -static int nfsspec_write __P((struct vop_write_args *)); -static int nfsfifo_read __P((struct vop_read_args *)); -static int nfsfifo_write __P((struct vop_write_args *)); -static int nfsspec_close __P((struct vop_close_args *)); -static int nfsfifo_close __P((struct vop_close_args *)); +static int nfsspec_read (struct vop_read_args *); +static int nfsspec_write (struct vop_write_args *); +static int nfsfifo_read (struct vop_read_args *); +static int nfsfifo_write (struct vop_write_args *); +static int nfsspec_close (struct vop_close_args *); +static int nfsfifo_close (struct vop_close_args *); #define nfs_poll vop_nopoll -static int nfs_flush __P((struct vnode *,int,struct thread *,int)); -static int nfs_setattrrpc __P((struct vnode *,struct vattr *,struct ucred *,struct thread *)); -static int nfs_lookup __P((struct vop_lookup_args *)); -static int nfs_create __P((struct vop_create_args *)); -static int nfs_mknod __P((struct vop_mknod_args *)); -static int nfs_open __P((struct vop_open_args *)); -static int nfs_close __P((struct vop_close_args *)); -static int nfs_access __P((struct vop_access_args *)); -static int nfs_getattr __P((struct vop_getattr_args *)); -static int nfs_setattr __P((struct vop_setattr_args *)); -static int nfs_read __P((struct vop_read_args *)); -static int nfs_mmap __P((struct vop_mmap_args *)); -static int nfs_fsync __P((struct vop_fsync_args *)); -static int nfs_remove __P((struct vop_remove_args *)); -static int nfs_link __P((struct vop_link_args *)); -static int nfs_rename __P((struct vop_rename_args *)); -static int nfs_mkdir __P((struct vop_mkdir_args *)); -static int nfs_rmdir __P((struct vop_rmdir_args *)); -static int nfs_symlink __P((struct vop_symlink_args *)); -static int nfs_readdir __P((struct vop_readdir_args *)); -static int nfs_bmap __P((struct vop_bmap_args *)); -static int nfs_strategy __P((struct vop_strategy_args *)); -static int nfs_lookitup __P((struct vnode *, const char *, int, - struct ucred *, struct thread *, struct nfsnode **)); -static int nfs_sillyrename __P((struct vnode *,struct vnode *,struct componentname *)); -static int nfsspec_access __P((struct vop_access_args *)); -static int nfs_readlink __P((struct vop_readlink_args *)); -static int nfs_print __P((struct vop_print_args *)); -static int nfs_advlock __P((struct vop_advlock_args *)); -static int nfs_bwrite __P((struct vop_bwrite_args *)); +static int nfs_flush (struct vnode *,int,struct thread *,int); +static int nfs_setattrrpc (struct vnode *,struct vattr *,struct ucred *,struct thread *); +static int nfs_lookup (struct vop_lookup_args *); +static int nfs_create (struct vop_create_args *); +static int nfs_mknod (struct vop_mknod_args *); +static int nfs_open (struct vop_open_args *); +static int nfs_close (struct vop_close_args *); +static int nfs_access (struct vop_access_args *); +static int nfs_getattr (struct vop_getattr_args *); +static int nfs_setattr (struct vop_setattr_args *); +static int nfs_read (struct vop_read_args *); +static int nfs_mmap (struct vop_mmap_args *); +static int nfs_fsync (struct vop_fsync_args *); +static int nfs_remove (struct vop_remove_args *); +static int nfs_link (struct vop_link_args *); +static int nfs_rename (struct vop_rename_args *); +static int nfs_mkdir (struct vop_mkdir_args *); +static int nfs_rmdir (struct vop_rmdir_args *); +static int nfs_symlink (struct vop_symlink_args *); +static int nfs_readdir (struct vop_readdir_args *); +static int nfs_bmap (struct vop_bmap_args *); +static int nfs_strategy (struct vop_strategy_args *); +static int nfs_lookitup (struct vnode *, const char *, int, + struct ucred *, struct thread *, struct nfsnode **); +static int nfs_sillyrename (struct vnode *,struct vnode *,struct componentname *); +static int nfsspec_access (struct vop_access_args *); +static int nfs_readlink (struct vop_readlink_args *); +static int nfs_print (struct vop_print_args *); +static int nfs_advlock (struct vop_advlock_args *); +static int nfs_bwrite (struct vop_bwrite_args *); /* * Global vfs data structures for nfs */ @@ -228,19 +228,19 @@ static struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc = { &fifo_nfsv2nodeop_p, nfsv2_fifoop_entries }; VNODEOP_SET(fifo_nfsv2nodeop_opv_desc); -static int nfs_mknodrpc __P((struct vnode *dvp, struct vnode **vpp, +static int nfs_mknodrpc (struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, - struct vattr *vap)); -static int nfs_removerpc __P((struct vnode *dvp, const char *name, + struct vattr *vap); +static int nfs_removerpc (struct vnode *dvp, const char *name, int namelen, - struct ucred *cred, struct thread *td)); -static int nfs_renamerpc __P((struct vnode *fdvp, const char *fnameptr, + struct ucred *cred, struct thread *td); +static int nfs_renamerpc (struct vnode *fdvp, const char *fnameptr, int fnamelen, struct vnode *tdvp, const char *tnameptr, int tnamelen, - struct ucred *cred, struct thread *td)); -static int nfs_renameit __P((struct vnode *sdvp, + struct ucred *cred, struct thread *td); +static int nfs_renameit (struct vnode *sdvp, struct componentname *scnp, - struct sillyrename *sp)); + struct sillyrename *sp); /* * Global variables diff --git a/sys/vfs/nfs/nfsm_subs.h b/sys/vfs/nfs/nfsm_subs.h index a94e2d125b..3b83c3edab 100644 --- a/sys/vfs/nfs/nfsm_subs.h +++ b/sys/vfs/nfs/nfsm_subs.h @@ -35,7 +35,7 @@ * * @(#)nfsm_subs.h 8.2 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfsm_subs.h,v 1.27.2.1 2000/10/28 16:27:27 dwmalone Exp $ - * $DragonFly: src/sys/vfs/nfs/nfsm_subs.h,v 1.3 2003/07/01 18:48:31 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfsm_subs.h,v 1.4 2003/08/20 09:56:33 rob Exp $ */ @@ -54,13 +54,13 @@ struct vnode; /* * First define what the actual subs. return */ -struct mbuf *nfsm_reqh __P((struct vnode *vp, u_long procid, int hsiz, - caddr_t *bposp)); -struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid, +struct mbuf *nfsm_reqh (struct vnode *vp, u_long procid, int hsiz, + caddr_t *bposp); +struct mbuf *nfsm_rpchead (struct ucred *cr, int nmflag, int procid, int auth_type, int auth_len, char *auth_str, int verf_len, char *verf_str, struct mbuf *mrest, int mrest_len, - struct mbuf **mbp, u_int32_t *xidp)); + struct mbuf **mbp, u_int32_t *xidp); #define M_HASCL(m) ((m)->m_flags & M_EXT) #define NFSMINOFF(m) \ diff --git a/sys/vfs/nfs/nfsnode.h b/sys/vfs/nfs/nfsnode.h index 91adec6644..28290773c4 100644 --- a/sys/vfs/nfs/nfsnode.h +++ b/sys/vfs/nfs/nfsnode.h @@ -35,7 +35,7 @@ * * @(#)nfsnode.h 8.9 (Berkeley) 5/14/95 * $FreeBSD: src/sys/nfs/nfsnode.h,v 1.32.2.1 2001/06/26 04:20:11 bp Exp $ - * $DragonFly: src/sys/vfs/nfs/nfsnode.h,v 1.4 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfsnode.h,v 1.5 2003/08/20 09:56:33 rob Exp $ */ @@ -192,18 +192,18 @@ extern vop_t **spec_nfsv2nodeop_p; /* * Prototypes for NFS vnode operations */ -int nfs_getpages __P((struct vop_getpages_args *)); -int nfs_putpages __P((struct vop_putpages_args *)); -int nfs_write __P((struct vop_write_args *)); -int nqnfs_vop_lease_check __P((struct vop_lease_args *)); -int nfs_inactive __P((struct vop_inactive_args *)); -int nfs_reclaim __P((struct vop_reclaim_args *)); +int nfs_getpages (struct vop_getpages_args *); +int nfs_putpages (struct vop_putpages_args *); +int nfs_write (struct vop_write_args *); +int nqnfs_vop_lease_check (struct vop_lease_args *); +int nfs_inactive (struct vop_inactive_args *); +int nfs_reclaim (struct vop_reclaim_args *); /* other stuff */ -int nfs_removeit __P((struct sillyrename *)); -int nfs_nget __P((struct mount *,nfsfh_t *,int,struct nfsnode **)); -nfsuint64 *nfs_getcookie __P((struct nfsnode *, off_t, int)); -void nfs_invaldir __P((struct vnode *)); +int nfs_removeit (struct sillyrename *); +int nfs_nget (struct mount *,nfsfh_t *,int,struct nfsnode **); +nfsuint64 *nfs_getcookie (struct nfsnode *, off_t, int); +void nfs_invaldir (struct vnode *); #define nqnfs_lease_updatetime nfs_lease_updatetime diff --git a/sys/vfs/nfs/nqnfs.h b/sys/vfs/nfs/nqnfs.h index a3428c81d3..ebe2c2382b 100644 --- a/sys/vfs/nfs/nqnfs.h +++ b/sys/vfs/nfs/nqnfs.h @@ -35,7 +35,7 @@ * * @(#)nqnfs.h 8.3 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nqnfs.h,v 1.22 2000/02/13 03:32:07 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/Attic/nqnfs.h,v 1.4 2003/06/26 05:55:18 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/Attic/nqnfs.h,v 1.5 2003/08/20 09:56:33 rob Exp $ */ @@ -190,20 +190,20 @@ extern u_long nqfhhash; #define NQNFS_EXPIRED 500 #define NQNFS_TRYLATER 501 -void nqnfs_lease_check __P((struct vnode *, struct thread *, struct ucred *, int)); -void nqnfs_lease_updatetime __P((int)); -int nqsrv_getlease __P((struct vnode *, u_int32_t *, int, +void nqnfs_lease_check (struct vnode *, struct thread *, struct ucred *, int); +void nqnfs_lease_updatetime (int); +int nqsrv_getlease (struct vnode *, u_int32_t *, int, struct nfssvc_sock *, struct thread *, struct sockaddr *, int *, u_quad_t *, - struct ucred *)); -int nqnfs_getlease __P((struct vnode *,int,struct thread *)); -int nqnfs_callback __P((struct nfsmount *,struct mbuf *,struct mbuf *,caddr_t)); -int nqnfs_clientd __P((struct nfsmount *,struct ucred *,struct nfsd_cargs *,int,caddr_t,struct thread *)); + struct ucred *); +int nqnfs_getlease (struct vnode *,int,struct thread *); +int nqnfs_callback (struct nfsmount *,struct mbuf *,struct mbuf *,caddr_t); +int nqnfs_clientd (struct nfsmount *,struct ucred *,struct nfsd_cargs *,int,caddr_t,struct thread *); struct nfsnode; -void nqnfs_clientlease __P((struct nfsmount *, struct nfsnode *, int, int, time_t, u_quad_t)); -void nqnfs_serverd __P((void)); -int nqnfsrv_getlease __P((struct nfsrv_descript *, struct nfssvc_sock *, struct thread *, struct mbuf **)); -int nqnfsrv_vacated __P((struct nfsrv_descript *, struct nfssvc_sock *, struct thread *, struct mbuf **)); +void nqnfs_clientlease (struct nfsmount *, struct nfsnode *, int, int, time_t, u_quad_t); +void nqnfs_serverd (void); +int nqnfsrv_getlease (struct nfsrv_descript *, struct nfssvc_sock *, struct thread *, struct mbuf **); +int nqnfsrv_vacated (struct nfsrv_descript *, struct nfssvc_sock *, struct thread *, struct mbuf **); #endif #endif diff --git a/sys/vfs/ntfs/ntfs.h b/sys/vfs/ntfs/ntfs.h index 799ecf03a4..b4403ba3f4 100644 --- a/sys/vfs/ntfs/ntfs.h +++ b/sys/vfs/ntfs/ntfs.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs.h,v 1.8.2.2 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs.h,v 1.3 2003/08/20 09:56:33 rob Exp $ */ /*#define NTFS_DEBUG 1*/ @@ -305,7 +305,7 @@ MALLOC_DECLARE(M_NTFSNTHASH); #define M_NTFSNTNODE M_NTFS #define M_NTFSFNODE M_NTFS #define M_NTFSDIR M_NTFS -typedef int (vop_t) __P((void *)); +typedef int (vop_t) (void *); #define HASHINIT(a, b, c, d) hashinit((a), (b), (c), (d)) #define bqrelse(bp) brelse(bp) #define VOP__UNLOCK(a, b, c) VOP_UNLOCK((a), (b)) diff --git a/sys/vfs/ntfs/ntfs_ihash.h b/sys/vfs/ntfs/ntfs_ihash.h index ce9595127d..558fbd9e62 100644 --- a/sys/vfs/ntfs/ntfs_ihash.h +++ b/sys/vfs/ntfs/ntfs_ihash.h @@ -26,12 +26,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_ihash.h,v 1.5 1999/12/03 20:37:39 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_ihash.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_ihash.h,v 1.3 2003/08/20 09:56:33 rob Exp $ */ extern struct lock ntfs_hashlock; -void ntfs_nthashinit __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); +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/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c index f9e6b69b54..01370fa3c6 100644 --- a/sys/vfs/ntfs/ntfs_subr.c +++ b/sys/vfs/ntfs/ntfs_subr.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_subr.c,v 1.7.2.4 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.8 2003/08/20 09:56:33 rob Exp $ */ #include @@ -62,10 +62,10 @@ MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage"); MALLOC_DEFINE(M_NTFSDECOMP, "NTFS decomp", "NTFS decompression temporary"); #endif -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/vfs/ntfs/ntfs_subr.h b/sys/vfs/ntfs/ntfs_subr.h index a14b7d4cc4..04962b3bc0 100644 --- a/sys/vfs/ntfs/ntfs_subr.h +++ b/sys/vfs/ntfs/ntfs_subr.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_subr.h,v 1.7.2.1 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.h,v 1.3 2003/08/20 09:56:33 rob Exp $ */ #define VA_LOADED 0x0001 @@ -75,38 +75,38 @@ 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)); -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); +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/vfs/ntfs/ntfs_vfsops.c b/sys/vfs/ntfs/ntfs_vfsops.c index 10aa6fc928..e16ce905e1 100644 --- a/sys/vfs/ntfs/ntfs_vfsops.c +++ b/sys/vfs/ntfs/ntfs_vfsops.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vfsops.c,v 1.20.2.5 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.8 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.9 2003/08/20 09:56:33 rob Exp $ */ @@ -75,42 +75,42 @@ MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer"); #endif -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, - struct vnode **vpp)); -static int ntfs_mountfs __P((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_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, + struct vnode **vpp); +static int ntfs_mountfs (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 **); #if !defined (__FreeBSD__) -static int ntfs_quotactl __P((struct mount *, int, uid_t, caddr_t, - struct thread *)); -static int ntfs_start __P((struct mount *, int, struct thread *)); -static int ntfs_sync __P((struct mount *, int, struct ucred *, - struct thread *)); +static int ntfs_quotactl (struct mount *, int, uid_t, caddr_t, + struct thread *); +static int ntfs_start (struct mount *, int, struct thread *); +static int ntfs_sync (struct mount *, int, struct ucred *, + struct thread *); #endif #if defined(__FreeBSD__) struct sockaddr; -static int ntfs_mount __P((struct mount *, char *, caddr_t, - struct nameidata *, struct thread *)); -static int ntfs_init __P((struct vfsconf *)); -static int ntfs_checkexp __P((struct mount *, struct sockaddr *, - int *, struct ucred **)); +static int ntfs_mount (struct mount *, char *, caddr_t, + struct nameidata *, struct thread *); +static int ntfs_init (struct vfsconf *); +static int ntfs_checkexp (struct mount *, struct sockaddr *, + int *, struct ucred **); #elif defined(__NetBSD__) -static int ntfs_mount __P((struct mount *, const char *, void *, - struct nameidata *, struct thread *)); -static void ntfs_init __P((void)); -static int ntfs_mountroot __P((void)); -static int ntfs_sysctl __P((int *, u_int, void *, size_t *, void *, - size_t, struct thread *)); -static int ntfs_checkexp __P((struct mount *, struct mbuf *, - int *, struct ucred **)); +static int ntfs_mount (struct mount *, const char *, void *, + struct nameidata *, struct thread *); +static void ntfs_init (void); +static int ntfs_mountroot (void); +static int ntfs_sysctl (int *, u_int, void *, size_t *, void *, + size_t, struct thread *); +static int ntfs_checkexp (struct mount *, struct mbuf *, + int *, struct ucred **); #endif /* diff --git a/sys/vfs/ntfs/ntfs_vnops.c b/sys/vfs/ntfs/ntfs_vnops.c index fa5af03add..0dc151fcf4 100644 --- a/sys/vfs/ntfs/ntfs_vnops.c +++ b/sys/vfs/ntfs/ntfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vnops.c,v 1.9.2.4 2002/08/06 19:35:18 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.6 2003/08/07 21:17:42 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.7 2003/08/20 09:56:33 rob Exp $ * */ @@ -80,27 +80,27 @@ #include /* 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_bmap __P((struct vop_bmap_args *ap)); +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_bmap (struct vop_bmap_args *ap); #if defined(__FreeBSD__) -static int ntfs_getpages __P((struct vop_getpages_args *ap)); -static int ntfs_putpages __P((struct vop_putpages_args *)); -static int ntfs_fsync __P((struct vop_fsync_args *ap)); +static int ntfs_getpages (struct vop_getpages_args *ap); +static int ntfs_putpages (struct vop_putpages_args *); +static int ntfs_fsync (struct vop_fsync_args *ap); #else -static int ntfs_bypass __P((struct vop_generic_args *ap)); +static int ntfs_bypass (struct vop_generic_args *ap); #endif -static int ntfs_pathconf __P((void *)); +static int ntfs_pathconf (void *); int ntfs_prtactive = 1; /* 1 => print out reclaim of active vnodes */ @@ -986,7 +986,7 @@ struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = { { &vop_truncate_desc, genfs_eopnotsupp }, /* truncate */ { &vop_update_desc, genfs_eopnotsupp }, /* update */ { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ - { (struct vnodeop_desc *)NULL, (int (*) __P((void *)))NULL } + { (struct vnodeop_desc *)NULL, (int (*) (void *))NULL } }; struct vnodeopv_desc ntfs_vnodeop_opv_desc = { &ntfs_vnodeop_p, ntfs_vnodeop_entries }; diff --git a/sys/vfs/portal/portal_vfsops.c b/sys/vfs/portal/portal_vfsops.c index 34777138ec..3d5c296971 100644 --- a/sys/vfs/portal/portal_vfsops.c +++ b/sys/vfs/portal/portal_vfsops.c @@ -36,7 +36,7 @@ * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/portal/portal_vfsops.c,v 1.26.2.2 2001/07/26 20:37:16 iedowse Exp $ - * $DragonFly: src/sys/vfs/portal/portal_vfsops.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/portal/portal_vfsops.c,v 1.5 2003/08/20 09:56:33 rob Exp $ */ /* @@ -60,13 +60,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/vfs/portal/portal_vnops.c b/sys/vfs/portal/portal_vnops.c index 4453729d50..0d757e6a4e 100644 --- a/sys/vfs/portal/portal_vnops.c +++ b/sys/vfs/portal/portal_vnops.c @@ -36,7 +36,7 @@ * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * * $FreeBSD: src/sys/miscfs/portal/portal_vnops.c,v 1.38 1999/12/21 06:29:00 chris Exp $ - * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.7 2003/08/20 09:56:33 rob Exp $ */ /* @@ -66,17 +66,17 @@ static int portal_fileid = PORTAL_ROOTFILEID+1; -static int portal_badop __P((void)); -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_inactive __P((struct vop_inactive_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 int portal_badop (void); +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_inactive (struct vop_inactive_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/vfs/procfs/procfs.h b/sys/vfs/procfs/procfs.h index 5d520f943b..3e8afcb47c 100644 --- a/sys/vfs/procfs/procfs.h +++ b/sys/vfs/procfs/procfs.h @@ -38,7 +38,7 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs.h,v 1.32.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs.h,v 1.4 2003/06/25 03:56:00 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs.h,v 1.5 2003/08/20 09:56:33 rob Exp $ */ /* @@ -113,8 +113,8 @@ struct vfs_namemap { int nm_val; }; -int vfs_getuserstr __P((struct uio *, char *, int *)); -vfs_namemap_t *vfs_findname __P((vfs_namemap_t *, char *, int)); +int vfs_getuserstr (struct uio *, char *, int *); +vfs_namemap_t *vfs_findname (vfs_namemap_t *, char *, int); /* */ struct reg; @@ -123,43 +123,43 @@ struct dbreg; #define PFIND(pid) ((pid) ? pfind(pid) : &proc0) -void procfs_exit __P((struct thread *)); -int procfs_freevp __P((struct vnode *)); -int procfs_allocvp __P((struct mount *, struct vnode **, long, pfstype)); -struct vnode *procfs_findtextvp __P((struct proc *)); -int procfs_sstep __P((struct proc *)); -void procfs_fix_sstep __P((struct proc *)); -int procfs_read_regs __P((struct proc *, struct reg *)); -int procfs_write_regs __P((struct proc *, struct reg *)); -int procfs_read_fpregs __P((struct proc *, struct fpreg *)); -int procfs_write_fpregs __P((struct proc *, struct fpreg *)); -int procfs_read_dbregs __P((struct proc *, struct dbreg *)); -int procfs_write_dbregs __P((struct proc *, struct dbreg *)); -int procfs_donote __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_doregs __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_dofpregs __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_dodbregs __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_domem __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_doctl __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_dostatus __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_domap __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_dotype __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_docmdline __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); -int procfs_dorlimit __P((struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio)); +void procfs_exit (struct thread *); +int procfs_freevp (struct vnode *); +int procfs_allocvp (struct mount *, struct vnode **, long, pfstype); +struct vnode *procfs_findtextvp (struct proc *); +int procfs_sstep (struct proc *); +void procfs_fix_sstep (struct proc *); +int procfs_read_regs (struct proc *, struct reg *); +int procfs_write_regs (struct proc *, struct reg *); +int procfs_read_fpregs (struct proc *, struct fpreg *); +int procfs_write_fpregs (struct proc *, struct fpreg *); +int procfs_read_dbregs (struct proc *, struct dbreg *); +int procfs_write_dbregs (struct proc *, struct dbreg *); +int procfs_donote (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_doregs (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_dofpregs (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_dodbregs (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_domem (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_doctl (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_dostatus (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_domap (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_dotype (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_docmdline (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); +int procfs_dorlimit (struct proc *, struct proc *, struct pfsnode *pfsp, struct uio *uio); /* functions to check whether or not files should be displayed */ -int procfs_validfile __P((struct proc *)); -int procfs_validfpregs __P((struct proc *)); -int procfs_validregs __P((struct proc *)); -int procfs_validdbregs __P((struct proc *)); -int procfs_validmap __P((struct proc *)); -int procfs_validtype __P((struct proc *)); +int procfs_validfile (struct proc *); +int procfs_validfpregs (struct proc *); +int procfs_validregs (struct proc *); +int procfs_validdbregs (struct proc *); +int procfs_validmap (struct proc *); +int procfs_validtype (struct proc *); #define PROCFS_LOCKED 0x01 #define PROCFS_WANT 0x02 extern vop_t **procfs_vnodeop_p; -int procfs_root __P((struct mount *, struct vnode **)); -int procfs_rw __P((struct vop_read_args *)); +int procfs_root (struct mount *, struct vnode **); +int procfs_rw (struct vop_read_args *); #endif /* _KERNEL */ diff --git a/sys/vfs/procfs/procfs_ctl.c b/sys/vfs/procfs/procfs_ctl.c index 172b2b08b1..b904ca035d 100644 --- a/sys/vfs/procfs/procfs_ctl.c +++ b/sys/vfs/procfs/procfs_ctl.c @@ -38,7 +38,7 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs_ctl.c,v 1.20.2.2 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_ctl.c,v 1.5 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_ctl.c,v 1.6 2003/08/20 09:56:33 rob Exp $ */ #include @@ -101,7 +101,7 @@ static vfs_namemap_t 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(curp, p, op) diff --git a/sys/vfs/procfs/procfs_mem.c b/sys/vfs/procfs/procfs_mem.c index 96d2e78b79..41e0e1f40c 100644 --- a/sys/vfs/procfs/procfs_mem.c +++ b/sys/vfs/procfs/procfs_mem.c @@ -38,7 +38,7 @@ * @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94 * * $FreeBSD: src/sys/miscfs/procfs/procfs_mem.c,v 1.46.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_mem.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_mem.c,v 1.5 2003/08/20 09:56:33 rob Exp $ */ /* @@ -63,8 +63,8 @@ #include #include -static int procfs_rwmem __P((struct proc *curp, - struct proc *p, struct uio *uio)); +static int procfs_rwmem (struct proc *curp, + struct proc *p, struct uio *uio); static int procfs_rwmem(curp, p, uio) diff --git a/sys/vfs/procfs/procfs_vfsops.c b/sys/vfs/procfs/procfs_vfsops.c index 388f61447e..49edf62918 100644 --- a/sys/vfs/procfs/procfs_vfsops.c +++ b/sys/vfs/procfs/procfs_vfsops.c @@ -37,7 +37,7 @@ * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * * $FreeBSD: src/sys/miscfs/procfs/procfs_vfsops.c,v 1.32.2.1 2001/10/15 20:42:01 des Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_vfsops.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_vfsops.c,v 1.5 2003/08/20 09:56:33 rob Exp $ */ /* @@ -52,12 +52,12 @@ #include #include -static int procfs_mount __P((struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td)); -static int procfs_statfs __P((struct mount *mp, struct statfs *sbp, - struct thread *td)); -static int procfs_unmount __P((struct mount *mp, int mntflags, - struct thread *td)); +static int procfs_mount (struct mount *mp, char *path, caddr_t data, + struct nameidata *ndp, struct thread *td); +static int procfs_statfs (struct mount *mp, struct statfs *sbp, + struct thread *td); +static int procfs_unmount (struct mount *mp, int mntflags, + struct thread *td); /* * VFS Operations. diff --git a/sys/vfs/procfs/procfs_vnops.c b/sys/vfs/procfs/procfs_vnops.c index d33efa3805..2532854b1c 100644 --- a/sys/vfs/procfs/procfs_vnops.c +++ b/sys/vfs/procfs/procfs_vnops.c @@ -37,7 +37,7 @@ * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * * $FreeBSD: src/sys/miscfs/procfs/procfs_vnops.c,v 1.76.2.7 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.7 2003/08/07 21:17:43 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.8 2003/08/20 09:56:33 rob Exp $ */ /* @@ -63,20 +63,20 @@ #include #include -static int procfs_access __P((struct vop_access_args *)); -static int procfs_badop __P((void)); -static int procfs_bmap __P((struct vop_bmap_args *)); -static int procfs_close __P((struct vop_close_args *)); -static int procfs_getattr __P((struct vop_getattr_args *)); -static int procfs_inactive __P((struct vop_inactive_args *)); -static int procfs_ioctl __P((struct vop_ioctl_args *)); -static int procfs_lookup __P((struct vop_lookup_args *)); -static int procfs_open __P((struct vop_open_args *)); -static int procfs_print __P((struct vop_print_args *)); -static int procfs_readdir __P((struct vop_readdir_args *)); -static int procfs_readlink __P((struct vop_readlink_args *)); -static int procfs_reclaim __P((struct vop_reclaim_args *)); -static int procfs_setattr __P((struct vop_setattr_args *)); +static int procfs_access (struct vop_access_args *); +static int procfs_badop (void); +static int procfs_bmap (struct vop_bmap_args *); +static int procfs_close (struct vop_close_args *); +static int procfs_getattr (struct vop_getattr_args *); +static int procfs_inactive (struct vop_inactive_args *); +static int procfs_ioctl (struct vop_ioctl_args *); +static int procfs_lookup (struct vop_lookup_args *); +static int procfs_open (struct vop_open_args *); +static int procfs_print (struct vop_print_args *); +static int procfs_readdir (struct vop_readdir_args *); +static int procfs_readlink (struct vop_readlink_args *); +static int procfs_reclaim (struct vop_reclaim_args *); +static int procfs_setattr (struct vop_setattr_args *); /* * This is a list of the valid names in the @@ -88,7 +88,7 @@ static struct proc_target { u_char pt_namlen; char *pt_name; pfstype pt_pfstype; - int (*pt_valid) __P((struct proc *p)); + int (*pt_valid) (struct proc *p); } proc_targets[] = { #define N(s) sizeof(s)-1, s /* name type validp */ @@ -111,7 +111,7 @@ static struct proc_target { }; static const int nproc_targets = sizeof(proc_targets) / sizeof(proc_targets[0]); -static pid_t atopid __P((const char *, u_int)); +static pid_t atopid (const char *, u_int); /* * set things up for doing i/o on diff --git a/sys/vfs/specfs/spec_vnops.c b/sys/vfs/specfs/spec_vnops.c index 5d1a681ff9..6feff51e83 100644 --- a/sys/vfs/specfs/spec_vnops.c +++ b/sys/vfs/specfs/spec_vnops.c @@ -32,7 +32,7 @@ * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 * $FreeBSD: src/sys/miscfs/specfs/spec_vnops.c,v 1.131.2.4 2001/02/26 04:23:20 jlemon Exp $ - * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.11 2003/07/22 17:03:33 dillon Exp $ + * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.12 2003/08/20 09:56:33 rob Exp $ */ #include @@ -56,21 +56,21 @@ #include -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_inactive __P((struct vop_inactive_args *)); -static int spec_ioctl __P((struct vop_ioctl_args *)); -static int spec_open __P((struct vop_open_args *)); -static int spec_poll __P((struct vop_poll_args *)); -static int spec_kqfilter __P((struct vop_kqfilter_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_inactive (struct vop_inactive_args *); +static int spec_ioctl (struct vop_ioctl_args *); +static int spec_open (struct vop_open_args *); +static int spec_poll (struct vop_poll_args *); +static int spec_kqfilter (struct vop_kqfilter_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[] = { @@ -123,7 +123,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/vfs/ufs/ffs_alloc.c b/sys/vfs/ufs/ffs_alloc.c index 70ba9a7d22..f6735c78f6 100644 --- a/sys/vfs/ufs/ffs_alloc.c +++ b/sys/vfs/ufs/ffs_alloc.c @@ -32,7 +32,7 @@ * * @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95 * $FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.64.2.2 2001/09/21 19:15:21 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_alloc.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_alloc.c,v 1.7 2003/08/20 09:56:34 rob Exp $ */ #include "opt_quota.h" @@ -56,27 +56,27 @@ #include "fs.h" #include "ffs_extern.h" -typedef ufs_daddr_t allocfcn_t __P((struct inode *ip, int cg, ufs_daddr_t bpref, - int size)); +typedef ufs_daddr_t allocfcn_t (struct inode *ip, int cg, ufs_daddr_t bpref, + int size); -static ufs_daddr_t ffs_alloccg __P((struct inode *, int, ufs_daddr_t, int)); +static ufs_daddr_t ffs_alloccg (struct inode *, int, ufs_daddr_t, int); static ufs_daddr_t - ffs_alloccgblk __P((struct inode *, struct buf *, ufs_daddr_t)); + ffs_alloccgblk (struct inode *, struct buf *, ufs_daddr_t); #ifdef DIAGNOSTIC -static int ffs_checkblk __P((struct inode *, ufs_daddr_t, long)); +static int ffs_checkblk (struct inode *, ufs_daddr_t, long); #endif -static void ffs_clusteracct __P((struct fs *, struct cg *, ufs_daddr_t, - int)); -static ufs_daddr_t ffs_clusteralloc __P((struct inode *, int, ufs_daddr_t, - int)); -static ino_t ffs_dirpref __P((struct inode *)); -static ufs_daddr_t ffs_fragextend __P((struct inode *, int, long, int, int)); -static void ffs_fserr __P((struct fs *, u_int, char *)); +static void ffs_clusteracct (struct fs *, struct cg *, ufs_daddr_t, + int); +static ufs_daddr_t ffs_clusteralloc (struct inode *, int, ufs_daddr_t, + int); +static ino_t ffs_dirpref (struct inode *); +static ufs_daddr_t ffs_fragextend (struct inode *, int, long, int, int); +static void ffs_fserr (struct fs *, u_int, char *); static u_long ffs_hashalloc - __P((struct inode *, int, long, int, allocfcn_t *)); -static ino_t ffs_nodealloccg __P((struct inode *, int, ufs_daddr_t, int)); -static ufs_daddr_t ffs_mapsearch __P((struct fs *, struct cg *, ufs_daddr_t, - int)); + (struct inode *, int, long, int, allocfcn_t *); +static ino_t ffs_nodealloccg (struct inode *, int, ufs_daddr_t, int); +static ufs_daddr_t ffs_mapsearch (struct fs *, struct cg *, ufs_daddr_t, + int); /* * Allocate a block in the file system. diff --git a/sys/vfs/ufs/ffs_extern.h b/sys/vfs/ufs/ffs_extern.h index 551cf3b057..55bc4a9dea 100644 --- a/sys/vfs/ufs/ffs_extern.h +++ b/sys/vfs/ufs/ffs_extern.h @@ -32,7 +32,7 @@ * * @(#)ffs_extern.h 8.6 (Berkeley) 3/30/95 * $FreeBSD: src/sys/ufs/ffs/ffs_extern.h,v 1.30 2000/01/09 22:40:02 mckusick Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_extern.h,v 1.4 2003/06/26 05:55:20 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_extern.h,v 1.5 2003/08/20 09:56:34 rob Exp $ */ #ifndef _UFS_FFS_EXTERN_H @@ -70,37 +70,37 @@ struct vop_bmap_args; struct vop_fsync_args; struct vop_reallocblks_args; -int ffs_alloc __P((struct inode *, - ufs_daddr_t, ufs_daddr_t, int, struct ucred *, ufs_daddr_t *)); -int ffs_balloc __P((struct vop_balloc_args *)); -int ffs_blkatoff __P((struct vnode *, off_t, char **, struct buf **)); -void ffs_blkfree __P((struct inode *, ufs_daddr_t, long)); -ufs_daddr_t ffs_blkpref __P((struct inode *, ufs_daddr_t, int, ufs_daddr_t *)); -int ffs_bmap __P((struct vop_bmap_args *)); -void ffs_clrblock __P((struct fs *, u_char *, ufs_daddr_t)); -int ffs_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -int ffs_flushfiles __P((struct mount *, int, struct thread *)); -void ffs_fragacct __P((struct fs *, int, int32_t [], int)); -int ffs_freefile __P(( struct vnode *, ino_t, int )); -int ffs_isblock __P((struct fs *, u_char *, ufs_daddr_t)); -int ffs_isfreeblock __P((struct fs *, unsigned char *, ufs_daddr_t)); -int ffs_mountfs __P((struct vnode *, struct mount *, struct thread *, - struct malloc_type *)); -int ffs_mountroot __P((void)); -int ffs_reallocblks __P((struct vop_reallocblks_args *)); -int ffs_realloccg __P((struct inode *, - ufs_daddr_t, ufs_daddr_t, int, int, struct ucred *, struct buf **)); -void ffs_setblock __P((struct fs *, u_char *, ufs_daddr_t)); -int ffs_statfs __P((struct mount *, struct statfs *, struct thread *)); -int ffs_sync __P((struct mount *, int, struct thread *)); -int ffs_truncate __P((struct vnode *, off_t, int, struct ucred *, struct thread *)); -int ffs_unmount __P((struct mount *, int, struct thread *)); -int ffs_update __P((struct vnode *, int)); -int ffs_valloc __P((struct vnode *, int, struct ucred *, struct vnode **)); +int ffs_alloc (struct inode *, + ufs_daddr_t, ufs_daddr_t, int, struct ucred *, ufs_daddr_t *); +int ffs_balloc (struct vop_balloc_args *); +int ffs_blkatoff (struct vnode *, off_t, char **, struct buf **); +void ffs_blkfree (struct inode *, ufs_daddr_t, long); +ufs_daddr_t ffs_blkpref (struct inode *, ufs_daddr_t, int, ufs_daddr_t *); +int ffs_bmap (struct vop_bmap_args *); +void ffs_clrblock (struct fs *, u_char *, ufs_daddr_t); +int ffs_fhtovp (struct mount *, struct fid *, struct vnode **); +int ffs_flushfiles (struct mount *, int, struct thread *); +void ffs_fragacct (struct fs *, int, int32_t [], int); +int ffs_freefile ( struct vnode *, ino_t, int ); +int ffs_isblock (struct fs *, u_char *, ufs_daddr_t); +int ffs_isfreeblock (struct fs *, unsigned char *, ufs_daddr_t); +int ffs_mountfs (struct vnode *, struct mount *, struct thread *, + struct malloc_type *); +int ffs_mountroot (void); +int ffs_reallocblks (struct vop_reallocblks_args *); +int ffs_realloccg (struct inode *, + ufs_daddr_t, ufs_daddr_t, int, int, struct ucred *, struct buf **); +void ffs_setblock (struct fs *, u_char *, ufs_daddr_t); +int ffs_statfs (struct mount *, struct statfs *, struct thread *); +int ffs_sync (struct mount *, int, struct thread *); +int ffs_truncate (struct vnode *, off_t, int, struct ucred *, struct thread *); +int ffs_unmount (struct mount *, int, struct thread *); +int ffs_update (struct vnode *, int); +int ffs_valloc (struct vnode *, int, struct ucred *, struct vnode **); -int ffs_vfree __P((struct vnode *, ino_t, int)); -int ffs_vget __P((struct mount *, ino_t, struct vnode **)); -int ffs_vptofh __P((struct vnode *, struct fid *)); +int ffs_vfree (struct vnode *, ino_t, int); +int ffs_vget (struct mount *, ino_t, struct vnode **); +int ffs_vptofh (struct vnode *, struct fid *); extern vop_t **ffs_vnodeop_p; extern vop_t **ffs_specop_p; @@ -109,22 +109,22 @@ extern vop_t **ffs_fifoop_p; /* * Soft update function prototypes. */ -void softdep_initialize __P((void)); -int softdep_mount __P((struct vnode *, struct mount *, struct fs *)); -int softdep_flushfiles __P((struct mount *, int, struct thread *)); -void softdep_update_inodeblock __P((struct inode *, struct buf *, int)); -void softdep_load_inodeblock __P((struct inode *)); -void softdep_freefile __P((struct vnode *, ino_t, int)); -void softdep_setup_freeblocks __P((struct inode *, off_t)); -void softdep_setup_inomapdep __P((struct buf *, struct inode *, ino_t)); -void softdep_setup_blkmapdep __P((struct buf *, struct fs *, ufs_daddr_t)); -void softdep_setup_allocdirect __P((struct inode *, ufs_lbn_t, ufs_daddr_t, - ufs_daddr_t, long, long, struct buf *)); -void softdep_setup_allocindir_meta __P((struct buf *, struct inode *, - struct buf *, int, ufs_daddr_t)); -void softdep_setup_allocindir_page __P((struct inode *, ufs_lbn_t, - struct buf *, int, ufs_daddr_t, ufs_daddr_t, struct buf *)); -void softdep_fsync_mountdev __P((struct vnode *)); -int softdep_sync_metadata __P((struct vop_fsync_args *)); +void softdep_initialize (void); +int softdep_mount (struct vnode *, struct mount *, struct fs *); +int softdep_flushfiles (struct mount *, int, struct thread *); +void softdep_update_inodeblock (struct inode *, struct buf *, int); +void softdep_load_inodeblock (struct inode *); +void softdep_freefile (struct vnode *, ino_t, int); +void softdep_setup_freeblocks (struct inode *, off_t); +void softdep_setup_inomapdep (struct buf *, struct inode *, ino_t); +void softdep_setup_blkmapdep (struct buf *, struct fs *, ufs_daddr_t); +void softdep_setup_allocdirect (struct inode *, ufs_lbn_t, ufs_daddr_t, + ufs_daddr_t, long, long, struct buf *); +void softdep_setup_allocindir_meta (struct buf *, struct inode *, + struct buf *, int, ufs_daddr_t); +void softdep_setup_allocindir_page (struct inode *, ufs_lbn_t, + struct buf *, int, ufs_daddr_t, ufs_daddr_t, struct buf *); +void softdep_fsync_mountdev (struct vnode *); +int softdep_sync_metadata (struct vop_fsync_args *); #endif /* !_UFS_FFS_EXTERN_H */ diff --git a/sys/vfs/ufs/ffs_inode.c b/sys/vfs/ufs/ffs_inode.c index 662ee38949..2df849e1c7 100644 --- a/sys/vfs/ufs/ffs_inode.c +++ b/sys/vfs/ufs/ffs_inode.c @@ -32,7 +32,7 @@ * * @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95 * $FreeBSD: src/sys/ufs/ffs/ffs_inode.c,v 1.56.2.5 2002/02/05 18:35:03 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_inode.c,v 1.8 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_inode.c,v 1.9 2003/08/20 09:56:34 rob Exp $ */ #include "opt_quota.h" @@ -61,8 +61,8 @@ #include -static int ffs_indirtrunc __P((struct inode *, ufs_daddr_t, ufs_daddr_t, - ufs_daddr_t, int, long *)); +static int ffs_indirtrunc (struct inode *, ufs_daddr_t, ufs_daddr_t, + ufs_daddr_t, int, long *); /* * Update the access, modified, and inode change times as specified by the diff --git a/sys/vfs/ufs/ffs_softdep.c b/sys/vfs/ufs/ffs_softdep.c index 28216b1a0a..a444bf296c 100644 --- a/sys/vfs/ufs/ffs_softdep.c +++ b/sys/vfs/ufs/ffs_softdep.c @@ -37,7 +37,7 @@ * * from: @(#)ffs_softdep.c 9.59 (McKusick) 6/21/00 * $FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.57.2.11 2002/02/05 18:46:53 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.10 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.11 2003/08/20 09:56:34 rob Exp $ */ /* @@ -142,66 +142,66 @@ static struct malloc_type *memtype[] = { /* * Internal function prototypes. */ -static void softdep_error __P((char *, int)); -static void drain_output __P((struct vnode *, int)); -static int getdirtybuf __P((struct buf **, int)); -static void clear_remove __P((struct thread *)); -static void clear_inodedeps __P((struct thread *)); -static int flush_pagedep_deps __P((struct vnode *, struct mount *, - struct diraddhd *)); -static int flush_inodedep_deps __P((struct fs *, ino_t)); -static int handle_written_filepage __P((struct pagedep *, struct buf *)); -static void diradd_inode_written __P((struct diradd *, struct inodedep *)); -static int handle_written_inodeblock __P((struct inodedep *, struct buf *)); -static void handle_allocdirect_partdone __P((struct allocdirect *)); -static void handle_allocindir_partdone __P((struct allocindir *)); -static void initiate_write_filepage __P((struct pagedep *, struct buf *)); -static void handle_written_mkdir __P((struct mkdir *, int)); -static void initiate_write_inodeblock __P((struct inodedep *, struct buf *)); -static void handle_workitem_freefile __P((struct freefile *)); -static void handle_workitem_remove __P((struct dirrem *)); -static struct dirrem *newdirrem __P((struct buf *, struct inode *, - struct inode *, int, struct dirrem **)); -static void free_diradd __P((struct diradd *)); -static void free_allocindir __P((struct allocindir *, struct inodedep *)); -static int indir_trunc __P((struct inode *, ufs_daddr_t, int, ufs_lbn_t, - long *)); -static void deallocate_dependencies __P((struct buf *, struct inodedep *)); -static void free_allocdirect __P((struct allocdirectlst *, - struct allocdirect *, int)); -static int check_inode_unwritten __P((struct inodedep *)); -static int free_inodedep __P((struct inodedep *)); -static void handle_workitem_freeblocks __P((struct freeblks *)); -static void merge_inode_lists __P((struct inodedep *)); -static void setup_allocindir_phase2 __P((struct buf *, struct inode *, - struct allocindir *)); -static struct allocindir *newallocindir __P((struct inode *, int, ufs_daddr_t, - ufs_daddr_t)); -static void handle_workitem_freefrag __P((struct freefrag *)); -static struct freefrag *newfreefrag __P((struct inode *, ufs_daddr_t, long)); -static void allocdirect_merge __P((struct allocdirectlst *, - struct allocdirect *, struct allocdirect *)); -static struct bmsafemap *bmsafemap_lookup __P((struct buf *)); -static int newblk_lookup __P((struct fs *, ufs_daddr_t, int, - struct newblk **)); -static int inodedep_lookup __P((struct fs *, ino_t, int, struct inodedep **)); -static int pagedep_lookup __P((struct inode *, ufs_lbn_t, int, - struct pagedep **)); -static void pause_timer __P((void *)); -static int request_cleanup __P((int, int)); -static int process_worklist_item __P((struct mount *, int)); -static void add_to_worklist __P((struct worklist *)); +static void softdep_error (char *, int); +static void drain_output (struct vnode *, int); +static int getdirtybuf (struct buf **, int); +static void clear_remove (struct thread *); +static void clear_inodedeps (struct thread *); +static int flush_pagedep_deps (struct vnode *, struct mount *, + struct diraddhd *); +static int flush_inodedep_deps (struct fs *, ino_t); +static int handle_written_filepage (struct pagedep *, struct buf *); +static void diradd_inode_written (struct diradd *, struct inodedep *); +static int handle_written_inodeblock (struct inodedep *, struct buf *); +static void handle_allocdirect_partdone (struct allocdirect *); +static void handle_allocindir_partdone (struct allocindir *); +static void initiate_write_filepage (struct pagedep *, struct buf *); +static void handle_written_mkdir (struct mkdir *, int); +static void initiate_write_inodeblock (struct inodedep *, struct buf *); +static void handle_workitem_freefile (struct freefile *); +static void handle_workitem_remove (struct dirrem *); +static struct dirrem *newdirrem (struct buf *, struct inode *, + struct inode *, int, struct dirrem **); +static void free_diradd (struct diradd *); +static void free_allocindir (struct allocindir *, struct inodedep *); +static int indir_trunc (struct inode *, ufs_daddr_t, int, ufs_lbn_t, + long *); +static void deallocate_dependencies (struct buf *, struct inodedep *); +static void free_allocdirect (struct allocdirectlst *, + struct allocdirect *, int); +static int check_inode_unwritten (struct inodedep *); +static int free_inodedep (struct inodedep *); +static void handle_workitem_freeblocks (struct freeblks *); +static void merge_inode_lists (struct inodedep *); +static void setup_allocindir_phase2 (struct buf *, struct inode *, + struct allocindir *); +static struct allocindir *newallocindir (struct inode *, int, ufs_daddr_t, + ufs_daddr_t); +static void handle_workitem_freefrag (struct freefrag *); +static struct freefrag *newfreefrag (struct inode *, ufs_daddr_t, long); +static void allocdirect_merge (struct allocdirectlst *, + struct allocdirect *, struct allocdirect *); +static struct bmsafemap *bmsafemap_lookup (struct buf *); +static int newblk_lookup (struct fs *, ufs_daddr_t, int, + struct newblk **); +static int inodedep_lookup (struct fs *, ino_t, int, struct inodedep **); +static int pagedep_lookup (struct inode *, ufs_lbn_t, int, + struct pagedep **); +static void pause_timer (void *); +static int request_cleanup (int, int); +static int process_worklist_item (struct mount *, int); +static void add_to_worklist (struct worklist *); /* * Exported softdep operations. */ -static void softdep_disk_io_initiation __P((struct buf *)); -static void softdep_disk_write_complete __P((struct buf *)); -static void softdep_deallocate_dependencies __P((struct buf *)); -static int softdep_fsync __P((struct vnode *)); -static int softdep_process_worklist __P((struct mount *)); -static void softdep_move_dependencies __P((struct buf *, struct buf *)); -static int softdep_count_dependencies __P((struct buf *bp, int)); +static void softdep_disk_io_initiation (struct buf *); +static void softdep_disk_write_complete (struct buf *); +static void softdep_deallocate_dependencies (struct buf *); +static int softdep_fsync (struct vnode *); +static int softdep_process_worklist (struct mount *); +static void softdep_move_dependencies (struct buf *, struct buf *); +static int softdep_count_dependencies (struct buf *bp, int); struct bio_ops bioops = { softdep_disk_io_initiation, /* io_start */ @@ -244,9 +244,9 @@ static struct lockit { } lk = { 0, NOHOLDER }; static int lockcnt; -static void acquire_lock __P((struct lockit *)); -static void free_lock __P((struct lockit *)); -void softdep_panic __P((char *)); +static void acquire_lock (struct lockit *); +static void free_lock (struct lockit *); +void softdep_panic (char *); #define ACQUIRE_LOCK(lk) acquire_lock(lk) #define FREE_LOCK(lk) free_lock(lk) @@ -295,8 +295,8 @@ softdep_panic(msg) } #endif /* DEBUG */ -static int interlocked_sleep __P((struct lockit *, int, void *, int, - const char *, int)); +static int interlocked_sleep (struct lockit *, int, void *, int, + const char *, int); /* * When going to sleep, we must save our SPL so that it does @@ -363,9 +363,9 @@ struct sema { int prio; int timo; }; -static void sema_init __P((struct sema *, char *, int, int)); -static int sema_get __P((struct sema *, struct lockit *)); -static void sema_release __P((struct sema *)); +static void sema_init (struct sema *, char *, int, int); +static int sema_get (struct sema *, struct lockit *); +static void sema_release (struct sema *); static void sema_init(semap, name, prio, timo) @@ -437,9 +437,9 @@ sema_release(semap) #define WORKITEM_FREE(item, type) FREE(item, DtoM(type)) #else /* DEBUG */ -static void worklist_insert __P((struct workhead *, struct worklist *)); -static void worklist_remove __P((struct worklist *)); -static void workitem_free __P((struct worklist *, int)); +static void worklist_insert (struct workhead *, struct worklist *); +static void worklist_remove (struct worklist *); +static void workitem_free (struct worklist *, int); #define WORKLIST_INSERT(head, item) worklist_insert(head, item) #define WORKLIST_REMOVE(item) worklist_remove(item) diff --git a/sys/vfs/ufs/ffs_subr.c b/sys/vfs/ufs/ffs_subr.c index 7e6d8b47cd..a77f80efeb 100644 --- a/sys/vfs/ufs/ffs_subr.c +++ b/sys/vfs/ufs/ffs_subr.c @@ -32,7 +32,7 @@ * * @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95 * $FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.25 1999/12/29 04:55:04 peter Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_subr.c,v 1.5 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_subr.c,v 1.6 2003/08/20 09:56:34 rob Exp $ */ #include @@ -54,7 +54,7 @@ #include "ffs_extern.h" #ifdef DDB -void ffs_checkoverlap __P((struct buf *, struct inode *)); +void ffs_checkoverlap (struct buf *, struct inode *); #endif /* diff --git a/sys/vfs/ufs/ffs_vfsops.c b/sys/vfs/ufs/ffs_vfsops.c index 61613e48d3..76a82e3198 100644 --- a/sys/vfs/ufs/ffs_vfsops.c +++ b/sys/vfs/ufs/ffs_vfsops.c @@ -32,7 +32,7 @@ * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.117.2.10 2002/06/23 22:34:52 iedowse Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.10 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.11 2003/08/20 09:56:34 rob Exp $ */ #include "opt_quota.h" @@ -64,12 +64,12 @@ static MALLOC_DEFINE(M_FFSNODE, "FFS node", "FFS vnode private part"); -static int ffs_sbupdate __P((struct ufsmount *, int)); -static int ffs_reload __P((struct mount *,struct ucred *,struct thread *)); -static int ffs_oldfscompat __P((struct fs *)); -static int ffs_mount __P((struct mount *, char *, caddr_t, - struct nameidata *, struct thread *)); -static int ffs_init __P((struct vfsconf *)); +static int ffs_sbupdate (struct ufsmount *, int); +static int ffs_reload (struct mount *,struct ucred *,struct thread *); +static int ffs_oldfscompat (struct fs *); +static int ffs_mount (struct mount *, char *, caddr_t, + struct nameidata *, struct thread *); +static int ffs_init (struct vfsconf *); static struct vfsops ufs_vfsops = { ffs_mount, diff --git a/sys/vfs/ufs/ffs_vnops.c b/sys/vfs/ufs/ffs_vnops.c index 13528f34b2..4ef47b6cde 100644 --- a/sys/vfs/ufs/ffs_vnops.c +++ b/sys/vfs/ufs/ffs_vnops.c @@ -32,7 +32,7 @@ * * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95 * $FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.64 2000/01/10 12:04:25 phk Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.5 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.6 2003/08/20 09:56:34 rob Exp $ */ #include @@ -64,11 +64,11 @@ #include "fs.h" #include "ffs_extern.h" -static int ffs_fsync __P((struct vop_fsync_args *)); -static int ffs_getpages __P((struct vop_getpages_args *)); -static int ffs_putpages __P((struct vop_putpages_args *)); -static int ffs_read __P((struct vop_read_args *)); -static int ffs_write __P((struct vop_write_args *)); +static int ffs_fsync (struct vop_fsync_args *); +static int ffs_getpages (struct vop_getpages_args *); +static int ffs_putpages (struct vop_putpages_args *); +static int ffs_read (struct vop_read_args *); +static int ffs_write (struct vop_write_args *); /* Global vfs data structures for ufs. */ vop_t **ffs_vnodeop_p; diff --git a/sys/vfs/ufs/quota.h b/sys/vfs/ufs/quota.h index 17406c3ffa..cd85724669 100644 --- a/sys/vfs/ufs/quota.h +++ b/sys/vfs/ufs/quota.h @@ -35,7 +35,7 @@ * * @(#)quota.h 8.3 (Berkeley) 8/19/94 * $FreeBSD: src/sys/ufs/ufs/quota.h,v 1.15.2.1 2003/02/27 12:04:13 das Exp $ - * $DragonFly: src/sys/vfs/ufs/quota.h,v 1.3 2003/06/25 03:56:12 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/quota.h,v 1.4 2003/08/20 09:56:34 rob Exp $ */ #ifndef _UFS_UFS_QUOTA_H_ @@ -179,25 +179,25 @@ struct thread; struct ucred; struct vnode; -int chkdq __P((struct inode *, long, struct ucred *, int)); -int chkiq __P((struct inode *, long, struct ucred *, int)); -void dqinit __P((void)); -void dqrele __P((struct vnode *, struct dquot *)); -int getinoquota __P((struct inode *)); -int getquota __P((struct mount *, u_long, int, caddr_t)); -int qsync __P((struct mount *mp)); -int quotaoff __P((struct thread *, struct mount *, int)); -int quotaon __P((struct thread *, struct mount *, int, caddr_t)); -int setquota __P((struct mount *, u_long, int, caddr_t)); -int setuse __P((struct mount *, u_long, int, caddr_t)); -int ufs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct thread *)); +int chkdq (struct inode *, long, struct ucred *, int); +int chkiq (struct inode *, long, struct ucred *, int); +void dqinit (void); +void dqrele (struct vnode *, struct dquot *); +int getinoquota (struct inode *); +int getquota (struct mount *, u_long, int, caddr_t); +int qsync (struct mount *mp); +int quotaoff (struct thread *, struct mount *, int); +int quotaon (struct thread *, struct mount *, int, caddr_t); +int setquota (struct mount *, u_long, int, caddr_t); +int setuse (struct mount *, u_long, int, caddr_t); +int ufs_quotactl (struct mount *, int, uid_t, caddr_t, struct thread *); #else /* !_KERNEL */ #include __BEGIN_DECLS -int quotactl __P((const char *, int, int, void *)); +int quotactl (const char *, int, int, void *); __END_DECLS #endif /* _KERNEL */ diff --git a/sys/vfs/ufs/ufs_extern.h b/sys/vfs/ufs/ufs_extern.h index 62f46dc8e4..74afc29cd2 100644 --- a/sys/vfs/ufs/ufs_extern.h +++ b/sys/vfs/ufs/ufs_extern.h @@ -32,7 +32,7 @@ * * @(#)ufs_extern.h 8.10 (Berkeley) 5/14/95 * $FreeBSD: src/sys/ufs/ufs/ufs_extern.h,v 1.27.2.1 2000/12/28 11:01:46 ps Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_extern.h,v 1.4 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_extern.h,v 1.5 2003/08/20 09:56:34 rob Exp $ */ #ifndef _UFS_UFS_EXTERN_H_ @@ -55,55 +55,55 @@ struct vop_generic_args; struct vop_inactive_args; struct vop_reclaim_args; -int ufs_vnoperate __P((struct vop_generic_args *)); -int ufs_vnoperatefifo __P((struct vop_generic_args *)); -int ufs_vnoperatespec __P((struct vop_generic_args *)); +int ufs_vnoperate (struct vop_generic_args *); +int ufs_vnoperatefifo (struct vop_generic_args *); +int ufs_vnoperatespec (struct vop_generic_args *); -int ufs_bmap __P((struct vop_bmap_args *)); -int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, struct indir *, - int *, int *, int *)); -int ufs_check_export __P((struct mount *, struct sockaddr *, - int *, struct ucred **)); +int ufs_bmap (struct vop_bmap_args *); +int ufs_bmaparray (struct vnode *, daddr_t, daddr_t *, struct indir *, + int *, int *, int *); +int ufs_check_export (struct mount *, struct sockaddr *, + int *, struct ucred **); int ufs_fhtovp(struct mount *, struct ufid *, struct vnode **); -int ufs_checkpath __P((struct inode *, struct inode *, struct ucred *)); -void ufs_dirbad __P((struct inode *, doff_t, char *)); -int ufs_dirbadentry __P((struct vnode *, struct direct *, int)); -int ufs_dirempty __P((struct inode *, ino_t, struct ucred *)); -void ufs_makedirentry __P((struct inode *, struct componentname *, - struct direct *)); -int ufs_direnter __P((struct vnode *, struct vnode *, struct direct *, - struct componentname *, struct buf *)); -int ufs_dirremove __P((struct vnode *, struct inode *, int, int)); -int ufs_dirrewrite __P((struct inode *, struct inode *, ino_t, int, int)); -int ufs_getlbns __P((struct vnode *, ufs_daddr_t, struct indir *, int *)); +int ufs_checkpath (struct inode *, struct inode *, struct ucred *); +void ufs_dirbad (struct inode *, doff_t, char *); +int ufs_dirbadentry (struct vnode *, struct direct *, int); +int ufs_dirempty (struct inode *, ino_t, struct ucred *); +void ufs_makedirentry (struct inode *, struct componentname *, + struct direct *); +int ufs_direnter (struct vnode *, struct vnode *, struct direct *, + struct componentname *, struct buf *); +int ufs_dirremove (struct vnode *, struct inode *, int, int); +int ufs_dirrewrite (struct inode *, struct inode *, ino_t, int, int); +int ufs_getlbns (struct vnode *, ufs_daddr_t, struct indir *, int *); struct vnode * - ufs_ihashget __P((dev_t, ino_t)); -void ufs_ihashinit __P((void)); -void ufs_ihashins __P((struct inode *)); + ufs_ihashget (dev_t, ino_t); +void ufs_ihashinit (void); +void ufs_ihashins (struct inode *); struct vnode * - ufs_ihashlookup __P((dev_t, ino_t)); -void ufs_ihashrem __P((struct inode *)); -int ufs_inactive __P((struct vop_inactive_args *)); -int ufs_init __P((struct vfsconf *)); -void ufs_itimes __P((struct vnode *vp)); -int ufs_lookup __P((struct vop_cachedlookup_args *)); -int ufs_reclaim __P((struct vop_reclaim_args *)); -int ufs_root __P((struct mount *, struct vnode **)); -int ufs_start __P((struct mount *, int, struct thread *)); -int ufs_vinit __P((struct mount *, vop_t **, vop_t **, struct vnode **)); + ufs_ihashlookup (dev_t, ino_t); +void ufs_ihashrem (struct inode *); +int ufs_inactive (struct vop_inactive_args *); +int ufs_init (struct vfsconf *); +void ufs_itimes (struct vnode *vp); +int ufs_lookup (struct vop_cachedlookup_args *); +int ufs_reclaim (struct vop_reclaim_args *); +int ufs_root (struct mount *, struct vnode **); +int ufs_start (struct mount *, int, struct thread *); +int ufs_vinit (struct mount *, vop_t **, vop_t **, struct vnode **); /* * Soft update function prototypes. */ -void softdep_setup_directory_add __P((struct buf *, struct inode *, off_t, - long, struct buf *)); -void softdep_change_directoryentry_offset __P((struct inode *, caddr_t, - caddr_t, caddr_t, int)); -void softdep_setup_remove __P((struct buf *,struct inode *, struct inode *, - int)); -void softdep_setup_directory_change __P((struct buf *, struct inode *, - struct inode *, long, int)); -void softdep_change_linkcnt __P((struct inode *)); -int softdep_slowdown __P((struct vnode *)); +void softdep_setup_directory_add (struct buf *, struct inode *, off_t, + long, struct buf *); +void softdep_change_directoryentry_offset (struct inode *, caddr_t, + caddr_t, caddr_t, int); +void softdep_setup_remove (struct buf *,struct inode *, struct inode *, + int); +void softdep_setup_directory_change (struct buf *, struct inode *, + struct inode *, long, int); +void softdep_change_linkcnt (struct inode *); +int softdep_slowdown (struct vnode *); #endif /* !_UFS_UFS_EXTERN_H_ */ diff --git a/sys/vfs/ufs/ufs_quota.c b/sys/vfs/ufs/ufs_quota.c index dd77f1e821..3eea7aeb5f 100644 --- a/sys/vfs/ufs/ufs_quota.c +++ b/sys/vfs/ufs/ufs_quota.c @@ -35,7 +35,7 @@ * * @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.27.2.3 2002/01/15 10:33:32 phk Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.9 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.10 2003/08/20 09:56:34 rob Exp $ */ #include @@ -60,16 +60,16 @@ static MALLOC_DEFINE(M_DQUOT, "UFS quota", "UFS quota entries"); */ static char *quotatypes[] = INITQFNAMES; -static int chkdqchg __P((struct inode *, long, struct ucred *, int)); -static int chkiqchg __P((struct inode *, long, struct ucred *, int)); -static int dqget __P((struct vnode *, - u_long, struct ufsmount *, int, struct dquot **)); -static int dqsync __P((struct vnode *, struct dquot *)); -static void dqflush __P((struct vnode *)); +static int chkdqchg (struct inode *, long, struct ucred *, int); +static int chkiqchg (struct inode *, long, struct ucred *, int); +static int dqget (struct vnode *, + u_long, struct ufsmount *, int, struct dquot **); +static int dqsync (struct vnode *, struct dquot *); +static void dqflush (struct vnode *); #ifdef DIAGNOSTIC -static void dqref __P((struct dquot *)); -static void chkdquot __P((struct inode *)); +static void dqref (struct dquot *); +static void chkdquot (struct inode *); #endif /* diff --git a/sys/vfs/ufs/ufs_vnops.c b/sys/vfs/ufs/ufs_vnops.c index 8b264ea368..4eeb6dcf8b 100644 --- a/sys/vfs/ufs/ufs_vnops.c +++ b/sys/vfs/ufs/ufs_vnops.c @@ -37,7 +37,7 @@ * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 * $FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.131.2.8 2003/01/02 17:26:19 bde Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.8 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.9 2003/08/20 09:56:34 rob Exp $ */ #include "opt_quota.h" @@ -77,43 +77,43 @@ #include "dirhash.h" #endif -static int ufs_access __P((struct vop_access_args *)); -static int ufs_advlock __P((struct vop_advlock_args *)); -static int ufs_chmod __P((struct vnode *, int, struct ucred *, struct thread *)); -static int ufs_chown __P((struct vnode *, uid_t, gid_t, struct ucred *, struct thread *)); -static int ufs_close __P((struct vop_close_args *)); -static int ufs_create __P((struct vop_create_args *)); -static int ufs_getattr __P((struct vop_getattr_args *)); -static int ufs_link __P((struct vop_link_args *)); -static int ufs_makeinode __P((int mode, struct vnode *, struct vnode **, struct componentname *)); -static int ufs_missingop __P((struct vop_generic_args *ap)); -static int ufs_mkdir __P((struct vop_mkdir_args *)); -static int ufs_mknod __P((struct vop_mknod_args *)); -static int ufs_mmap __P((struct vop_mmap_args *)); -static int ufs_open __P((struct vop_open_args *)); -static int ufs_pathconf __P((struct vop_pathconf_args *)); -static int ufs_print __P((struct vop_print_args *)); -static int ufs_readdir __P((struct vop_readdir_args *)); -static int ufs_readlink __P((struct vop_readlink_args *)); -static int ufs_remove __P((struct vop_remove_args *)); -static int ufs_rename __P((struct vop_rename_args *)); -static int ufs_rmdir __P((struct vop_rmdir_args *)); -static int ufs_setattr __P((struct vop_setattr_args *)); -static int ufs_strategy __P((struct vop_strategy_args *)); -static int ufs_symlink __P((struct vop_symlink_args *)); -static int ufs_whiteout __P((struct vop_whiteout_args *)); -static int ufsfifo_close __P((struct vop_close_args *)); -static int ufsfifo_kqfilter __P((struct vop_kqfilter_args *)); -static int ufsfifo_read __P((struct vop_read_args *)); -static int ufsfifo_write __P((struct vop_write_args *)); -static int ufsspec_close __P((struct vop_close_args *)); -static int ufsspec_read __P((struct vop_read_args *)); -static int ufsspec_write __P((struct vop_write_args *)); -static int filt_ufsread __P((struct knote *kn, long hint)); -static int filt_ufswrite __P((struct knote *kn, long hint)); -static int filt_ufsvnode __P((struct knote *kn, long hint)); -static void filt_ufsdetach __P((struct knote *kn)); -static int ufs_kqfilter __P((struct vop_kqfilter_args *ap)); +static int ufs_access (struct vop_access_args *); +static int ufs_advlock (struct vop_advlock_args *); +static int ufs_chmod (struct vnode *, int, struct ucred *, struct thread *); +static int ufs_chown (struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); +static int ufs_close (struct vop_close_args *); +static int ufs_create (struct vop_create_args *); +static int ufs_getattr (struct vop_getattr_args *); +static int ufs_link (struct vop_link_args *); +static int ufs_makeinode (int mode, struct vnode *, struct vnode **, struct componentname *); +static int ufs_missingop (struct vop_generic_args *ap); +static int ufs_mkdir (struct vop_mkdir_args *); +static int ufs_mknod (struct vop_mknod_args *); +static int ufs_mmap (struct vop_mmap_args *); +static int ufs_open (struct vop_open_args *); +static int ufs_pathconf (struct vop_pathconf_args *); +static int ufs_print (struct vop_print_args *); +static int ufs_readdir (struct vop_readdir_args *); +static int ufs_readlink (struct vop_readlink_args *); +static int ufs_remove (struct vop_remove_args *); +static int ufs_rename (struct vop_rename_args *); +static int ufs_rmdir (struct vop_rmdir_args *); +static int ufs_setattr (struct vop_setattr_args *); +static int ufs_strategy (struct vop_strategy_args *); +static int ufs_symlink (struct vop_symlink_args *); +static int ufs_whiteout (struct vop_whiteout_args *); +static int ufsfifo_close (struct vop_close_args *); +static int ufsfifo_kqfilter (struct vop_kqfilter_args *); +static int ufsfifo_read (struct vop_read_args *); +static int ufsfifo_write (struct vop_write_args *); +static int ufsspec_close (struct vop_close_args *); +static int ufsspec_read (struct vop_read_args *); +static int ufsspec_write (struct vop_write_args *); +static int filt_ufsread (struct knote *kn, long hint); +static int filt_ufswrite (struct knote *kn, long hint); +static int filt_ufsvnode (struct knote *kn, long hint); +static void filt_ufsdetach (struct knote *kn); +static int ufs_kqfilter (struct vop_kqfilter_args *ap); union _qcvt { int64_t qcvt; diff --git a/sys/vfs/ufs/ufsmount.h b/sys/vfs/ufs/ufsmount.h index 67ba717054..db46dd9bb4 100644 --- a/sys/vfs/ufs/ufsmount.h +++ b/sys/vfs/ufs/ufsmount.h @@ -32,7 +32,7 @@ * * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95 * $FreeBSD: src/sys/ufs/ufs/ufsmount.h,v 1.17 1999/12/29 04:55:06 peter Exp $ - * $DragonFly: src/sys/vfs/ufs/ufsmount.h,v 1.3 2003/06/25 03:56:12 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ufsmount.h,v 1.4 2003/08/20 09:56:34 rob Exp $ */ #ifndef _UFS_UFS_UFSMOUNT_H_ @@ -97,11 +97,11 @@ struct ufsmount { int64_t um_savedmaxfilesize; /* XXX - limit maxfilesize */ struct malloc_type *um_malloctype; /* The inodes malloctype */ int um_i_effnlink_valid; /* i_effnlink valid? */ - int (*um_blkatoff) __P((struct vnode *, off_t, char **, struct buf **)); - int (*um_truncate) __P((struct vnode *, off_t, int, struct ucred *, struct thread *)); - int (*um_update) __P((struct vnode *, int)); - int (*um_valloc) __P((struct vnode *, int, struct ucred *, struct vnode **)); - int (*um_vfree) __P((struct vnode *, ino_t, int)); + int (*um_blkatoff) (struct vnode *, off_t, char **, struct buf **); + int (*um_truncate) (struct vnode *, off_t, int, struct ucred *, struct thread *); + int (*um_update) (struct vnode *, int); + int (*um_valloc) (struct vnode *, int, struct ucred *, struct vnode **); + int (*um_vfree) (struct vnode *, ino_t, int); }; #define UFS_BLKATOFF(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_blkatoff(aa, bb, cc, dd) diff --git a/sys/vfs/umapfs/umap.h b/sys/vfs/umapfs/umap.h index 69a5a86075..0c9fb9c8ae 100644 --- a/sys/vfs/umapfs/umap.h +++ b/sys/vfs/umapfs/umap.h @@ -36,7 +36,7 @@ * @(#)umap.h 8.4 (Berkeley) 8/20/94 * * $FreeBSD: src/sys/miscfs/umapfs/umap.h,v 1.13 1999/12/29 04:54:47 peter Exp $ - * $DragonFly: src/sys/vfs/umapfs/Attic/umap.h,v 1.2 2003/06/17 04:28:43 dillon Exp $ + * $DragonFly: src/sys/vfs/umapfs/Attic/umap.h,v 1.3 2003/08/20 09:56:34 rob Exp $ */ #define MAPFILEENTRIES 64 @@ -73,16 +73,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/vfs/umapfs/umap_subr.c b/sys/vfs/umapfs/umap_subr.c index 7e2c15604b..b7b061250d 100644 --- a/sys/vfs/umapfs/umap_subr.c +++ b/sys/vfs/umapfs/umap_subr.c @@ -36,7 +36,7 @@ * @(#)umap_subr.c 8.9 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/umapfs/umap_subr.c,v 1.19 1999/09/04 11:51:41 bde Exp $ - * $DragonFly: src/sys/vfs/umapfs/Attic/umap_subr.c,v 1.4 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/umapfs/Attic/umap_subr.c,v 1.5 2003/08/20 09:56:34 rob Exp $ */ #include @@ -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/vfs/umapfs/umap_vfsops.c b/sys/vfs/umapfs/umap_vfsops.c index 9197103a64..398ac83e5d 100644 --- a/sys/vfs/umapfs/umap_vfsops.c +++ b/sys/vfs/umapfs/umap_vfsops.c @@ -36,7 +36,7 @@ * @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/umapfs/umap_vfsops.c,v 1.31.2.2 2001/09/11 09:49:53 kris Exp $ - * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vfsops.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vfsops.c,v 1.7 2003/08/20 09:56:34 rob Exp $ */ /* @@ -57,28 +57,28 @@ 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 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, - 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 thread *td); +static int umapfs_unmount (struct mount *mp, int mntflags, + struct thread *td); +static int umapfs_vget (struct mount *mp, ino_t ino, + struct vnode **vpp); +static int umapfs_vptofh (struct vnode *vp, struct fid *fhp); +static int umapfs_extattrctl (struct mount *mp, int cmd, const char *attrname, caddr_t arg, - struct thread *td)); + struct thread *td); /* * Mount umap layer diff --git a/sys/vfs/umapfs/umap_vnops.c b/sys/vfs/umapfs/umap_vnops.c index 1aa1336040..7a890e094f 100644 --- a/sys/vfs/umapfs/umap_vnops.c +++ b/sys/vfs/umapfs/umap_vnops.c @@ -35,7 +35,7 @@ * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 * $FreeBSD: src/sys/miscfs/umapfs/umap_vnops.c,v 1.30 1999/08/30 07:08:04 bde Exp $ - * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vnops.c,v 1.4 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vnops.c,v 1.5 2003/08/20 09:56:34 rob Exp $ */ /* @@ -59,14 +59,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/vfs/union/union.h b/sys/vfs/union/union.h index 57afe49bc4..c2e9240ca0 100644 --- a/sys/vfs/union/union.h +++ b/sys/vfs/union/union.h @@ -36,7 +36,7 @@ * * @(#)union.h 8.9 (Berkeley) 12/10/94 * $FreeBSD: src/sys/miscfs/union/union.h,v 1.17 1999/12/29 04:54:48 peter Exp $ - * $DragonFly: src/sys/vfs/union/union.h,v 1.3 2003/06/25 03:56:01 dillon Exp $ + * $DragonFly: src/sys/vfs/union/union.h,v 1.4 2003/08/20 09:56:34 rob Exp $ */ struct union_args { @@ -114,30 +114,30 @@ 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 void union_vm_coherency __P((struct vnode *, struct uio *, int)); - -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 void union_vm_coherency (struct vnode *, struct uio *, int); + +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/vfs/union/union_subr.c b/sys/vfs/union/union_subr.c index 87a657b611..ca53bbf98b 100644 --- a/sys/vfs/union/union_subr.c +++ b/sys/vfs/union/union_subr.c @@ -36,7 +36,7 @@ * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 * $FreeBSD: src/sys/miscfs/union/union_subr.c,v 1.43.2.2 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/union/union_subr.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/union/union_subr.c,v 1.7 2003/08/20 09:56:34 rob Exp $ */ #include @@ -58,7 +58,7 @@ #include /* for vm cache coherency */ #include "union.h" -extern int union_init __P((void)); +extern int union_init (void); /* must be power of two, otherwise change UNION_HASH() */ #define NHASH 32 @@ -70,26 +70,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/vfs/union/union_vfsops.c b/sys/vfs/union/union_vfsops.c index ec368d13b1..8cc8db876a 100644 --- a/sys/vfs/union/union_vfsops.c +++ b/sys/vfs/union/union_vfsops.c @@ -36,7 +36,7 @@ * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 * $FreeBSD: src/sys/miscfs/union/union_vfsops.c,v 1.39.2.2 2001/10/25 19:18:53 dillon Exp $ - * $DragonFly: src/sys/vfs/union/union_vfsops.c,v 1.4 2003/08/07 21:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/union/union_vfsops.c,v 1.5 2003/08/20 09:56:34 rob Exp $ */ /* @@ -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/vfs/union/union_vnops.c b/sys/vfs/union/union_vnops.c index 0d550f55c6..7994f16c84 100644 --- a/sys/vfs/union/union_vnops.c +++ b/sys/vfs/union/union_vnops.c @@ -36,7 +36,7 @@ * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 * $FreeBSD: src/sys/miscfs/union/union_vnops.c,v 1.72 1999/12/15 23:02:14 eivind Exp $ - * $DragonFly: src/sys/vfs/union/union_vnops.c,v 1.6 2003/08/07 21:17:45 dillon Exp $ + * $DragonFly: src/sys/vfs/union/union_vnops.c,v 1.7 2003/08/20 09:56:34 rob Exp $ */ #include @@ -68,45 +68,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_bmap __P((struct vop_bmap_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_fsync __P((struct vop_fsync_args *ap)); -static int union_getattr __P((struct vop_getattr_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_bmap (struct vop_bmap_args *ap); +static int union_close (struct vop_close_args *ap); +static int union_create (struct vop_create_args *ap); +static int union_fsync (struct vop_fsync_args *ap); +static int union_getattr (struct vop_getattr_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_mmap __P((struct vop_mmap_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_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_getpages __P((struct vop_getpages_args *ap)); -static int union_putpages __P((struct vop_putpages_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_mmap (struct vop_mmap_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_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_getpages (struct vop_getpages_args *ap); +static int union_putpages (struct vop_putpages_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 * -- 2.41.0