From 6fde64c778e3d740d65c6a1e3db36df6cdd8ee68 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 1 Dec 2004 12:24:41 +0000 Subject: [PATCH] Mechanically change prototypes for vnode operations to use the new typedefs. --- sys/fs/cd9660/cd9660_vnops.c | 18 +++---- sys/fs/deadfs/dead_vnops.c | 16 +++--- sys/fs/devfs/devfs_vnops.c | 40 +++++++-------- sys/fs/fdescfs/fdesc_vnops.c | 14 +++--- sys/fs/fifofs/fifo_vnops.c | 14 +++--- sys/fs/hpfs/hpfs_vnops.c | 38 +++++++-------- sys/fs/msdosfs/msdosfs_vnops.c | 42 ++++++++-------- sys/fs/ntfs/ntfs_vnops.c | 26 +++++----- sys/fs/nullfs/null_vnops.c | 28 +++++------ sys/fs/nwfs/nwfs_vnops.c | 42 ++++++++-------- sys/fs/portalfs/portal_vnops.c | 12 ++--- sys/fs/smbfs/smbfs_vnops.c | 46 +++++++++--------- sys/fs/udf/udf_vnops.c | 22 ++++----- sys/fs/umapfs/umap_vnops.c | 16 +++--- sys/fs/unionfs/union_vnops.c | 86 ++++++++++++++++----------------- sys/gnu/ext2fs/ext2_vnops.c | 52 ++++++++++---------- sys/gnu/fs/ext2fs/ext2_vnops.c | 52 ++++++++++---------- sys/isofs/cd9660/cd9660_vnops.c | 18 +++---- sys/ufs/ffs/ffs_vnops.c | 22 ++++----- sys/ufs/ufs/ufs_vnops.c | 50 +++++++++---------- 20 files changed, 327 insertions(+), 327 deletions(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index b53c0134c0d2..9761c2f09cf8 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -60,18 +60,18 @@ __FBSDID("$FreeBSD$"); #include #include -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 *); +static vop_setattr_t cd9660_setattr; +static vop_access_t cd9660_access; +static vop_getattr_t cd9660_getattr; +static vop_ioctl_t cd9660_ioctl; +static vop_pathconf_t cd9660_pathconf; +static vop_read_t cd9660_read; struct isoreaddir; 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 vop_readdir_t cd9660_readdir; +static vop_readlink_t cd9660_readlink; +static vop_strategy_t cd9660_strategy; /* * Setattr call. Only allowed for block and character special devices. diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index ee57feb44d65..0f2094b08646 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -42,14 +42,14 @@ static int chkvnlock(struct vnode *); /* * Prototypes for dead operations on vnodes. */ -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_read(struct vop_read_args *); -static int dead_write(struct vop_write_args *); +static vop_bmap_t dead_bmap; +static vop_ioctl_t dead_ioctl; +static vop_lock_t dead_lock; +static vop_lookup_t dead_lookup; +static vop_open_t dead_open; +static vop_poll_t dead_poll; +static vop_read_t dead_read; +static vop_write_t dead_write; vop_t **dead_vnodeop_p; static struct vnodeopv_entry_desc dead_vnodeop_entries[] = { diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index cdab0a0201d4..a765b5a484a5 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -87,28 +87,28 @@ struct fileops devfs_ops_f = { .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE }; -static int devfs_access(struct vop_access_args *ap); -static int devfs_advlock(struct vop_advlock_args *ap); -static int devfs_close(struct vop_close_args *ap); -static int devfs_fsync(struct vop_fsync_args *ap); -static int devfs_getattr(struct vop_getattr_args *ap); -static int devfs_lookupx(struct vop_lookup_args *ap); -static int devfs_mknod(struct vop_mknod_args *ap); -static int devfs_open(struct vop_open_args *ap); -static int devfs_pathconf(struct vop_pathconf_args *ap); -static int devfs_print(struct vop_print_args *ap); -static int devfs_readdir(struct vop_readdir_args *ap); -static int devfs_readlink(struct vop_readlink_args *ap); -static int devfs_reclaim(struct vop_reclaim_args *ap); -static int devfs_remove(struct vop_remove_args *ap); -static int devfs_revoke(struct vop_revoke_args *ap); -static int devfs_rioctl(struct vop_ioctl_args *ap); -static int devfs_rread(struct vop_read_args *ap); -static int devfs_setattr(struct vop_setattr_args *ap); +static vop_access_t devfs_access; +static vop_advlock_t devfs_advlock; +static vop_close_t devfs_close; +static vop_fsync_t devfs_fsync; +static vop_getattr_t devfs_getattr; +static vop_lookup_t devfs_lookupx; +static vop_mknod_t devfs_mknod; +static vop_open_t devfs_open; +static vop_pathconf_t devfs_pathconf; +static vop_print_t devfs_print; +static vop_readdir_t devfs_readdir; +static vop_readlink_t devfs_readlink; +static vop_reclaim_t devfs_reclaim; +static vop_remove_t devfs_remove; +static vop_revoke_t devfs_revoke; +static vop_ioctl_t devfs_rioctl; +static vop_read_t devfs_rread; +static vop_setattr_t devfs_setattr; #ifdef MAC -static int devfs_setlabel(struct vop_setlabel_args *ap); +static vop_setlabel_t devfs_setlabel; #endif -static int devfs_symlink(struct vop_symlink_args *ap); +static vop_symlink_t devfs_symlink; static vop_t **devfs_vnodeop_p; vop_t **devfs_specop_p; diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index b6d1eea3b47a..3f25cdafc577 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -68,13 +68,13 @@ static vop_t **fdesc_vnodeop_p; static LIST_HEAD(fdhashhead, fdescnode) *fdhashtbl; static u_long fdhash; -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_readdir(struct vop_readdir_args *ap); -static int fdesc_reclaim(struct vop_reclaim_args *ap); -static int fdesc_setattr(struct vop_setattr_args *ap); +static vop_getattr_t fdesc_getattr; +static vop_inactive_t fdesc_inactive; +static vop_lookup_t fdesc_lookup; +static vop_open_t fdesc_open; +static vop_readdir_t fdesc_readdir; +static vop_reclaim_t fdesc_reclaim; +static vop_setattr_t fdesc_setattr; /* * Initialise cache headers diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 387a9e6f7b7a..a136e0fdd4d2 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -82,13 +82,13 @@ struct fifoinfo { long fi_writers; }; -static int fifo_print(struct vop_print_args *); -static int fifo_open(struct vop_open_args *); -static int fifo_close(struct vop_close_args *); -static int fifo_ioctl(struct vop_ioctl_args *); -static int fifo_kqfilter(struct vop_kqfilter_args *); -static int fifo_pathconf(struct vop_pathconf_args *); -static int fifo_advlock(struct vop_advlock_args *); +static vop_print_t fifo_print; +static vop_open_t fifo_open; +static vop_close_t fifo_close; +static vop_ioctl_t fifo_ioctl; +static vop_kqfilter_t fifo_kqfilter; +static vop_pathconf_t fifo_pathconf; +static vop_advlock_t fifo_advlock; static void filt_fifordetach(struct knote *kn); static int filt_fiforead(struct knote *kn, long hint); diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c index 58a2097ca683..d847d8d1041b 100644 --- a/sys/fs/hpfs/hpfs_vnops.c +++ b/sys/fs/hpfs/hpfs_vnops.c @@ -58,25 +58,25 @@ static int hpfs_de_uiomove(struct hpfsmount *, struct hpfsdirent *, struct uio *); -static int hpfs_ioctl(struct vop_ioctl_args *ap); -static int hpfs_read(struct vop_read_args *); -static int hpfs_write(struct vop_write_args *ap); -static int hpfs_getattr(struct vop_getattr_args *ap); -static int hpfs_setattr(struct vop_setattr_args *ap); -static int hpfs_inactive(struct vop_inactive_args *ap); -static int hpfs_print(struct vop_print_args *ap); -static int hpfs_reclaim(struct vop_reclaim_args *ap); -static int hpfs_strategy(struct vop_strategy_args *ap); -static int hpfs_access(struct vop_access_args *ap); -static int hpfs_open(struct vop_open_args *ap); -static int hpfs_close(struct vop_close_args *ap); -static int hpfs_readdir(struct vop_readdir_args *ap); -static int hpfs_lookup(struct vop_lookup_args *ap); -static int hpfs_create(struct vop_create_args *); -static int hpfs_remove(struct vop_remove_args *); -static int hpfs_bmap(struct vop_bmap_args *ap); -static int hpfs_fsync(struct vop_fsync_args *ap); -static int hpfs_pathconf(struct vop_pathconf_args *ap); +static vop_ioctl_t hpfs_ioctl; +static vop_read_t hpfs_read; +static vop_write_t hpfs_write; +static vop_getattr_t hpfs_getattr; +static vop_setattr_t hpfs_setattr; +static vop_inactive_t hpfs_inactive; +static vop_print_t hpfs_print; +static vop_reclaim_t hpfs_reclaim; +static vop_strategy_t hpfs_strategy; +static vop_access_t hpfs_access; +static vop_open_t hpfs_open; +static vop_close_t hpfs_close; +static vop_readdir_t hpfs_readdir; +static vop_lookup_t hpfs_lookup; +static vop_create_t hpfs_create; +static vop_remove_t hpfs_remove; +static vop_bmap_t hpfs_bmap; +static vop_fsync_t hpfs_fsync; +static vop_pathconf_t hpfs_pathconf; static int hpfs_fsync(ap) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 1b29db97c638..bcf72e7c0f89 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -84,27 +84,27 @@ /* * Prototypes for MSDOSFS vnode operations */ -static int msdosfs_advlock(struct vop_advlock_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 vop_advlock_t msdosfs_advlock; +static vop_create_t msdosfs_create; +static vop_mknod_t msdosfs_mknod; +static vop_close_t msdosfs_close; +static vop_access_t msdosfs_access; +static vop_getattr_t msdosfs_getattr; +static vop_setattr_t msdosfs_setattr; +static vop_read_t msdosfs_read; +static vop_write_t msdosfs_write; +static vop_fsync_t msdosfs_fsync; +static vop_remove_t msdosfs_remove; +static vop_link_t msdosfs_link; +static vop_rename_t msdosfs_rename; +static vop_mkdir_t msdosfs_mkdir; +static vop_rmdir_t msdosfs_rmdir; +static vop_symlink_t msdosfs_symlink; +static vop_readdir_t msdosfs_readdir; +static vop_bmap_t msdosfs_bmap; +static vop_strategy_t msdosfs_strategy; +static vop_print_t msdosfs_print; +static vop_pathconf_t msdosfs_pathconf; /* * Some general notes: diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c index 4d683f44358a..e578a717b78d 100644 --- a/sys/fs/ntfs/ntfs_vnops.c +++ b/sys/fs/ntfs/ntfs_vnops.c @@ -66,19 +66,19 @@ #include /* for pathconf(2) constants */ -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_reclaim(struct vop_reclaim_args *ap); -static int ntfs_bmap(struct vop_bmap_args *ap); -static int ntfs_strategy(struct vop_strategy_args *ap); -static int ntfs_access(struct vop_access_args *ap); -static int ntfs_open(struct vop_open_args *ap); -static int ntfs_close(struct vop_close_args *ap); -static int ntfs_readdir(struct vop_readdir_args *ap); -static int ntfs_lookup(struct vop_lookup_args *ap); -static int ntfs_fsync(struct vop_fsync_args *ap); +static vop_read_t ntfs_read; +static vop_write_t ntfs_write; +static vop_getattr_t ntfs_getattr; +static vop_inactive_t ntfs_inactive; +static vop_reclaim_t ntfs_reclaim; +static vop_bmap_t ntfs_bmap; +static vop_strategy_t ntfs_strategy; +static vop_access_t ntfs_access; +static vop_open_t ntfs_open; +static vop_close_t ntfs_close; +static vop_readdir_t ntfs_readdir; +static vop_lookup_t ntfs_lookup; +static vop_fsync_t ntfs_fsync; static int ntfs_pathconf(void *); int ntfs_prtactive = 1; /* 1 => print out reclaim of active vnodes */ diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 56406a1c3c64..bdb98b5b7568 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -192,20 +192,20 @@ static int null_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ SYSCTL_INT(_debug, OID_AUTO, nullfs_bug_bypass, CTLFLAG_RW, &null_bug_bypass, 0, ""); -static int null_access(struct vop_access_args *ap); -static int null_createvobject(struct vop_createvobject_args *ap); -static int null_destroyvobject(struct vop_destroyvobject_args *ap); -static int null_getattr(struct vop_getattr_args *ap); -static int null_getvobject(struct vop_getvobject_args *ap); -static int null_inactive(struct vop_inactive_args *ap); -static int null_islocked(struct vop_islocked_args *ap); -static int null_lock(struct vop_lock_args *ap); -static int null_lookup(struct vop_lookup_args *ap); -static int null_print(struct vop_print_args *ap); -static int null_reclaim(struct vop_reclaim_args *ap); -static int null_rename(struct vop_rename_args *ap); -static int null_setattr(struct vop_setattr_args *ap); -static int null_unlock(struct vop_unlock_args *ap); +static vop_access_t null_access; +static vop_createvobject_t null_createvobject; +static vop_destroyvobject_t null_destroyvobject; +static vop_getattr_t null_getattr; +static vop_getvobject_t null_getvobject; +static vop_inactive_t null_inactive; +static vop_islocked_t null_islocked; +static vop_lock_t null_lock; +static vop_lookup_t null_lookup; +static vop_print_t null_print; +static vop_reclaim_t null_reclaim; +static vop_rename_t null_rename; +static vop_setattr_t null_setattr; +static vop_unlock_t null_unlock; /* * This is the 10-Apr-92 bypass routine. diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c index d3c97f79250c..a3942d655fbb 100644 --- a/sys/fs/nwfs/nwfs_vnops.c +++ b/sys/fs/nwfs/nwfs_vnops.c @@ -60,27 +60,27 @@ /* * Prototypes for NWFS vnode operations */ -static int nwfs_create(struct vop_create_args *); -static int nwfs_mknod(struct vop_mknod_args *); -static int nwfs_open(struct vop_open_args *); -static int nwfs_close(struct vop_close_args *); -static int nwfs_access(struct vop_access_args *); -static int nwfs_getattr(struct vop_getattr_args *); -static int nwfs_setattr(struct vop_setattr_args *); -static int nwfs_read(struct vop_read_args *); -static int nwfs_write(struct vop_write_args *); -static int nwfs_fsync(struct vop_fsync_args *); -static int nwfs_remove(struct vop_remove_args *); -static int nwfs_link(struct vop_link_args *); -static int nwfs_lookup(struct vop_lookup_args *); -static int nwfs_rename(struct vop_rename_args *); -static int nwfs_mkdir(struct vop_mkdir_args *); -static int nwfs_rmdir(struct vop_rmdir_args *); -static int nwfs_symlink(struct vop_symlink_args *); -static int nwfs_readdir(struct vop_readdir_args *); -static int nwfs_strategy(struct vop_strategy_args *); -static int nwfs_print(struct vop_print_args *); -static int nwfs_pathconf(struct vop_pathconf_args *ap); +static vop_create_t nwfs_create; +static vop_mknod_t nwfs_mknod; +static vop_open_t nwfs_open; +static vop_close_t nwfs_close; +static vop_access_t nwfs_access; +static vop_getattr_t nwfs_getattr; +static vop_setattr_t nwfs_setattr; +static vop_read_t nwfs_read; +static vop_write_t nwfs_write; +static vop_fsync_t nwfs_fsync; +static vop_remove_t nwfs_remove; +static vop_link_t nwfs_link; +static vop_lookup_t nwfs_lookup; +static vop_rename_t nwfs_rename; +static vop_mkdir_t nwfs_mkdir; +static vop_rmdir_t nwfs_rmdir; +static vop_symlink_t nwfs_symlink; +static vop_readdir_t nwfs_readdir; +static vop_strategy_t nwfs_strategy; +static vop_print_t nwfs_print; +static vop_pathconf_t nwfs_pathconf; /* Global vfs data structures for nwfs */ vop_t **nwfs_vnodeop_p; diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index dce916592b4e..fcc5b557f6f6 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -64,12 +64,12 @@ static int portal_fileid = PORTAL_ROOTFILEID+1; static void portal_closefd(struct thread *td, int fd); static int portal_connect(struct socket *so, struct socket *so2); -static int portal_getattr(struct vop_getattr_args *ap); -static int portal_lookup(struct vop_lookup_args *ap); -static int portal_open(struct vop_open_args *ap); -static int portal_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 vop_getattr_t portal_getattr; +static vop_lookup_t portal_lookup; +static vop_open_t portal_open; +static vop_readdir_t portal_readdir; +static vop_reclaim_t portal_reclaim; +static vop_setattr_t portal_setattr; static void portal_closefd(td, fd) diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index e899aab88260..787483071a1d 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -60,29 +60,29 @@ /* * Prototypes for SMBFS vnode operations */ -static int smbfs_create(struct vop_create_args *); -static int smbfs_mknod(struct vop_mknod_args *); -static int smbfs_open(struct vop_open_args *); -static int smbfs_close(struct vop_close_args *); -static int smbfs_access(struct vop_access_args *); -static int smbfs_getattr(struct vop_getattr_args *); -static int smbfs_setattr(struct vop_setattr_args *); -static int smbfs_read(struct vop_read_args *); -static int smbfs_write(struct vop_write_args *); -static int smbfs_fsync(struct vop_fsync_args *); -static int smbfs_remove(struct vop_remove_args *); -static int smbfs_link(struct vop_link_args *); -static int smbfs_lookup(struct vop_lookup_args *); -static int smbfs_rename(struct vop_rename_args *); -static int smbfs_mkdir(struct vop_mkdir_args *); -static int smbfs_rmdir(struct vop_rmdir_args *); -static int smbfs_symlink(struct vop_symlink_args *); -static int smbfs_readdir(struct vop_readdir_args *); -static int smbfs_strategy(struct vop_strategy_args *); -static int smbfs_print(struct vop_print_args *); -static int smbfs_pathconf(struct vop_pathconf_args *ap); -static int smbfs_advlock(struct vop_advlock_args *); -static int smbfs_getextattr(struct vop_getextattr_args *ap); +static vop_create_t smbfs_create; +static vop_mknod_t smbfs_mknod; +static vop_open_t smbfs_open; +static vop_close_t smbfs_close; +static vop_access_t smbfs_access; +static vop_getattr_t smbfs_getattr; +static vop_setattr_t smbfs_setattr; +static vop_read_t smbfs_read; +static vop_write_t smbfs_write; +static vop_fsync_t smbfs_fsync; +static vop_remove_t smbfs_remove; +static vop_link_t smbfs_link; +static vop_lookup_t smbfs_lookup; +static vop_rename_t smbfs_rename; +static vop_mkdir_t smbfs_mkdir; +static vop_rmdir_t smbfs_rmdir; +static vop_symlink_t smbfs_symlink; +static vop_readdir_t smbfs_readdir; +static vop_strategy_t smbfs_strategy; +static vop_print_t smbfs_print; +static vop_pathconf_t smbfs_pathconf; +static vop_advlock_t smbfs_advlock; +static vop_getextattr_t smbfs_getextattr; vop_t **smbfs_vnodeop_p; static struct vnodeopv_entry_desc smbfs_vnodeop_entries[] = { diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index c46dc7aba8d3..c92bf5c18f31 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -54,17 +54,17 @@ extern struct iconv_functions *udf_iconv; -static int udf_access(struct vop_access_args *); -static int udf_getattr(struct vop_getattr_args *); -static int udf_ioctl(struct vop_ioctl_args *); -static int udf_pathconf(struct vop_pathconf_args *); -static int udf_read(struct vop_read_args *); -static int udf_readdir(struct vop_readdir_args *); -static int udf_readlink(struct vop_readlink_args *ap); -static int udf_strategy(struct vop_strategy_args *); -static int udf_bmap(struct vop_bmap_args *); -static int udf_lookup(struct vop_cachedlookup_args *); -static int udf_reclaim(struct vop_reclaim_args *); +static vop_access_t udf_access; +static vop_getattr_t udf_getattr; +static vop_ioctl_t udf_ioctl; +static vop_pathconf_t udf_pathconf; +static vop_read_t udf_read; +static vop_readdir_t udf_readdir; +static vop_readlink_t udf_readlink; +static vop_strategy_t udf_strategy; +static vop_bmap_t udf_bmap; +static vop_cachedlookup_t udf_lookup; +static vop_reclaim_t udf_reclaim; static int udf_readatoffset(struct udf_node *, int *, int, struct buf **, uint8_t **); static int udf_bmap_internal(struct udf_node *, uint32_t, daddr_t *, uint32_t *); diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c index 077411fa51ac..1b56007029f0 100644 --- a/sys/fs/umapfs/umap_vnops.c +++ b/sys/fs/umapfs/umap_vnops.c @@ -54,14 +54,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(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); +static vop_generic_t umap_bypass; +static vop_getattr_t umap_getattr; +static vop_inactive_t umap_inactive; +static vop_lock_t umap_lock; +static vop_print_t umap_print; +static vop_reclaim_t umap_reclaim; +static vop_rename_t umap_rename; +static vop_unlock_t umap_unlock; /* * This is the 10-Apr-92 bypass routine. diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index ce51f6890790..27ca0ed7f756 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -68,52 +68,52 @@ 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(struct vop_access_args *ap); -static int union_aclcheck(struct vop_aclcheck_args *ap); -static int union_advlock(struct vop_advlock_args *ap); -static int union_close(struct vop_close_args *ap); -static int union_closeextattr(struct vop_closeextattr_args *ap); -static int union_create(struct vop_create_args *ap); -static int union_createvobject(struct vop_createvobject_args *ap); -static int union_deleteextattr(struct vop_deleteextattr_args *ap); -static int union_destroyvobject(struct vop_destroyvobject_args *ap); -static int union_fsync(struct vop_fsync_args *ap); -static int union_getacl(struct vop_getacl_args *ap); -static int union_getattr(struct vop_getattr_args *ap); -static int union_getextattr(struct vop_getextattr_args *ap); -static int union_getvobject(struct vop_getvobject_args *ap); -static int union_inactive(struct vop_inactive_args *ap); -static int union_ioctl(struct vop_ioctl_args *ap); -static int union_lease(struct vop_lease_args *ap); -static int union_link(struct vop_link_args *ap); -static int union_listextattr(struct vop_listextattr_args *ap); -static int union_lookup(struct vop_lookup_args *ap); +static vop_access_t union_access; +static vop_aclcheck_t union_aclcheck; +static vop_advlock_t union_advlock; +static vop_close_t union_close; +static vop_closeextattr_t union_closeextattr; +static vop_create_t union_create; +static vop_createvobject_t union_createvobject; +static vop_deleteextattr_t union_deleteextattr; +static vop_destroyvobject_t union_destroyvobject; +static vop_fsync_t union_fsync; +static vop_getacl_t union_getacl; +static vop_getattr_t union_getattr; +static vop_getextattr_t union_getextattr; +static vop_getvobject_t union_getvobject; +static vop_inactive_t union_inactive; +static vop_ioctl_t union_ioctl; +static vop_lease_t union_lease; +static vop_link_t union_link; +static vop_listextattr_t union_listextattr; +static vop_lookup_t union_lookup; static int union_lookup1(struct vnode *udvp, struct vnode **dvp, struct vnode **vpp, struct componentname *cnp); -static int union_mkdir(struct vop_mkdir_args *ap); -static int union_mknod(struct vop_mknod_args *ap); -static int union_open(struct vop_open_args *ap); -static int union_openextattr(struct vop_openextattr_args *ap); -static int union_pathconf(struct vop_pathconf_args *ap); -static int union_print(struct vop_print_args *ap); -static int union_read(struct vop_read_args *ap); -static int union_readdir(struct vop_readdir_args *ap); -static int union_readlink(struct vop_readlink_args *ap); -static int union_getwritemount(struct vop_getwritemount_args *ap); -static int union_reclaim(struct vop_reclaim_args *ap); -static int union_remove(struct vop_remove_args *ap); -static int union_rename(struct vop_rename_args *ap); -static int union_rmdir(struct vop_rmdir_args *ap); -static int union_poll(struct vop_poll_args *ap); -static int union_setacl(struct vop_setacl_args *ap); -static int union_setattr(struct vop_setattr_args *ap); -static int union_setlabel(struct vop_setlabel_args *ap); -static int union_setextattr(struct vop_setextattr_args *ap); -static int union_strategy(struct vop_strategy_args *ap); -static int union_symlink(struct vop_symlink_args *ap); -static int union_whiteout(struct vop_whiteout_args *ap); -static int union_write(struct vop_read_args *ap); +static vop_mkdir_t union_mkdir; +static vop_mknod_t union_mknod; +static vop_open_t union_open; +static vop_openextattr_t union_openextattr; +static vop_pathconf_t union_pathconf; +static vop_print_t union_print; +static vop_read_t union_read; +static vop_readdir_t union_readdir; +static vop_readlink_t union_readlink; +static vop_getwritemount_t union_getwritemount; +static vop_reclaim_t union_reclaim; +static vop_remove_t union_remove; +static vop_rename_t union_rename; +static vop_rmdir_t union_rmdir; +static vop_poll_t union_poll; +static vop_setacl_t union_setacl; +static vop_setattr_t union_setattr; +static vop_setlabel_t union_setlabel; +static vop_setextattr_t union_setextattr; +static vop_strategy_t union_strategy; +static vop_symlink_t union_symlink; +static vop_whiteout_t union_whiteout; +static vop_read_t union_write; static __inline struct vnode * diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index 360be3721fc0..b644ab8e7bdb 100644 --- a/sys/gnu/ext2fs/ext2_vnops.c +++ b/sys/gnu/ext2fs/ext2_vnops.c @@ -81,35 +81,35 @@ static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); -static int ext2_access(struct vop_access_args *); -static int ext2_advlock(struct vop_advlock_args *); +static vop_access_t ext2_access; +static vop_advlock_t ext2_advlock; static int ext2_chmod(struct vnode *, int, struct ucred *, struct thread *); static int ext2_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); -static int ext2_close(struct vop_close_args *); -static int ext2_create(struct vop_create_args *); -static int ext2_fsync(struct vop_fsync_args *); -static int ext2_getattr(struct vop_getattr_args *); -static int ext2_kqfilter(struct vop_kqfilter_args *ap); -static int ext2_link(struct vop_link_args *); -static int ext2_mkdir(struct vop_mkdir_args *); -static int ext2_mknod(struct vop_mknod_args *); -static int ext2_open(struct vop_open_args *); -static int ext2_pathconf(struct vop_pathconf_args *); -static int ext2_print(struct vop_print_args *); -static int ext2_read(struct vop_read_args *); -static int ext2_readlink(struct vop_readlink_args *); -static int ext2_remove(struct vop_remove_args *); -static int ext2_rename(struct vop_rename_args *); -static int ext2_rmdir(struct vop_rmdir_args *); -static int ext2_setattr(struct vop_setattr_args *); -static int ext2_strategy(struct vop_strategy_args *); -static int ext2_symlink(struct vop_symlink_args *); -static int ext2_write(struct vop_write_args *); -static int ext2fifo_close(struct vop_close_args *); -static int ext2fifo_kqfilter(struct vop_kqfilter_args *); -static int ext2fifo_read(struct vop_read_args *); -static int ext2fifo_write(struct vop_write_args *); +static vop_close_t ext2_close; +static vop_create_t ext2_create; +static vop_fsync_t ext2_fsync; +static vop_getattr_t ext2_getattr; +static vop_kqfilter_t ext2_kqfilter; +static vop_link_t ext2_link; +static vop_mkdir_t ext2_mkdir; +static vop_mknod_t ext2_mknod; +static vop_open_t ext2_open; +static vop_pathconf_t ext2_pathconf; +static vop_print_t ext2_print; +static vop_read_t ext2_read; +static vop_readlink_t ext2_readlink; +static vop_remove_t ext2_remove; +static vop_rename_t ext2_rename; +static vop_rmdir_t ext2_rmdir; +static vop_setattr_t ext2_setattr; +static vop_strategy_t ext2_strategy; +static vop_symlink_t ext2_symlink; +static vop_write_t ext2_write; +static vop_close_t ext2fifo_close; +static vop_kqfilter_t ext2fifo_kqfilter; +static vop_read_t ext2fifo_read; +static vop_write_t ext2fifo_write; static int filt_ext2read(struct knote *kn, long hint); static int filt_ext2write(struct knote *kn, long hint); static int filt_ext2vnode(struct knote *kn, long hint); diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c index 360be3721fc0..b644ab8e7bdb 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -81,35 +81,35 @@ static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); -static int ext2_access(struct vop_access_args *); -static int ext2_advlock(struct vop_advlock_args *); +static vop_access_t ext2_access; +static vop_advlock_t ext2_advlock; static int ext2_chmod(struct vnode *, int, struct ucred *, struct thread *); static int ext2_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); -static int ext2_close(struct vop_close_args *); -static int ext2_create(struct vop_create_args *); -static int ext2_fsync(struct vop_fsync_args *); -static int ext2_getattr(struct vop_getattr_args *); -static int ext2_kqfilter(struct vop_kqfilter_args *ap); -static int ext2_link(struct vop_link_args *); -static int ext2_mkdir(struct vop_mkdir_args *); -static int ext2_mknod(struct vop_mknod_args *); -static int ext2_open(struct vop_open_args *); -static int ext2_pathconf(struct vop_pathconf_args *); -static int ext2_print(struct vop_print_args *); -static int ext2_read(struct vop_read_args *); -static int ext2_readlink(struct vop_readlink_args *); -static int ext2_remove(struct vop_remove_args *); -static int ext2_rename(struct vop_rename_args *); -static int ext2_rmdir(struct vop_rmdir_args *); -static int ext2_setattr(struct vop_setattr_args *); -static int ext2_strategy(struct vop_strategy_args *); -static int ext2_symlink(struct vop_symlink_args *); -static int ext2_write(struct vop_write_args *); -static int ext2fifo_close(struct vop_close_args *); -static int ext2fifo_kqfilter(struct vop_kqfilter_args *); -static int ext2fifo_read(struct vop_read_args *); -static int ext2fifo_write(struct vop_write_args *); +static vop_close_t ext2_close; +static vop_create_t ext2_create; +static vop_fsync_t ext2_fsync; +static vop_getattr_t ext2_getattr; +static vop_kqfilter_t ext2_kqfilter; +static vop_link_t ext2_link; +static vop_mkdir_t ext2_mkdir; +static vop_mknod_t ext2_mknod; +static vop_open_t ext2_open; +static vop_pathconf_t ext2_pathconf; +static vop_print_t ext2_print; +static vop_read_t ext2_read; +static vop_readlink_t ext2_readlink; +static vop_remove_t ext2_remove; +static vop_rename_t ext2_rename; +static vop_rmdir_t ext2_rmdir; +static vop_setattr_t ext2_setattr; +static vop_strategy_t ext2_strategy; +static vop_symlink_t ext2_symlink; +static vop_write_t ext2_write; +static vop_close_t ext2fifo_close; +static vop_kqfilter_t ext2fifo_kqfilter; +static vop_read_t ext2fifo_read; +static vop_write_t ext2fifo_write; static int filt_ext2read(struct knote *kn, long hint); static int filt_ext2write(struct knote *kn, long hint); static int filt_ext2vnode(struct knote *kn, long hint); diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index b53c0134c0d2..9761c2f09cf8 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -60,18 +60,18 @@ __FBSDID("$FreeBSD$"); #include #include -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 *); +static vop_setattr_t cd9660_setattr; +static vop_access_t cd9660_access; +static vop_getattr_t cd9660_getattr; +static vop_ioctl_t cd9660_ioctl; +static vop_pathconf_t cd9660_pathconf; +static vop_read_t cd9660_read; struct isoreaddir; 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 vop_readdir_t cd9660_readdir; +static vop_readlink_t cd9660_readlink; +static vop_strategy_t cd9660_strategy; /* * Setattr call. Only allowed for block and character special devices. diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 3716bb0464c5..f2722a2bcecb 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -101,20 +101,20 @@ __FBSDID("$FreeBSD$"); #ifdef DIRECTIO extern int ffs_rawread(struct vnode *vp, struct uio *uio, int *workdone); #endif -static int ffs_fsync(struct vop_fsync_args *); -static int ffs_getpages(struct vop_getpages_args *); -static int ffs_read(struct vop_read_args *); -static int ffs_write(struct vop_write_args *); +static vop_fsync_t ffs_fsync; +static vop_getpages_t ffs_getpages; +static vop_read_t ffs_read; +static vop_write_t ffs_write; static int ffs_extread(struct vnode *vp, struct uio *uio, int ioflag); static int ffs_extwrite(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred); -static int ffsext_strategy(struct vop_strategy_args *); -static int ffs_closeextattr(struct vop_closeextattr_args *); -static int ffs_deleteextattr(struct vop_deleteextattr_args *); -static int ffs_getextattr(struct vop_getextattr_args *); -static int ffs_listextattr(struct vop_listextattr_args *); -static int ffs_openextattr(struct vop_openextattr_args *); -static int ffs_setextattr(struct vop_setextattr_args *); +static vop_strategy_t ffsext_strategy; +static vop_closeextattr_t ffs_closeextattr; +static vop_deleteextattr_t ffs_deleteextattr; +static vop_getextattr_t ffs_getextattr; +static vop_listextattr_t ffs_listextattr; +static vop_openextattr_t ffs_openextattr; +static vop_setextattr_t ffs_setextattr; /* Global vfs data structures for ufs. */ diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 0614629a0563..166e84883d01 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -84,38 +84,38 @@ __FBSDID("$FreeBSD$"); #include -static int ufs_access(struct vop_access_args *); -static int ufs_advlock(struct vop_advlock_args *); +static vop_access_t ufs_access; +static vop_advlock_t ufs_advlock; 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 vop_close_t ufs_close; +static vop_create_t ufs_create; +static vop_getattr_t ufs_getattr; +static vop_link_t ufs_link; static int ufs_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); -static int ufs_mkdir(struct vop_mkdir_args *); -static int ufs_mknod(struct vop_mknod_args *); -static int ufs_open(struct vop_open_args *); -static int ufs_pathconf(struct vop_pathconf_args *); -static int ufs_lock(struct vop_lock_args *); -static int ufs_print(struct vop_print_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 vop_mkdir_t ufs_mkdir; +static vop_mknod_t ufs_mknod; +static vop_open_t ufs_open; +static vop_pathconf_t ufs_pathconf; +static vop_lock_t ufs_lock; +static vop_print_t ufs_print; +static vop_readlink_t ufs_readlink; +static vop_remove_t ufs_remove; +static vop_rename_t ufs_rename; +static vop_rmdir_t ufs_rmdir; +static vop_setattr_t ufs_setattr; +static vop_strategy_t ufs_strategy; +static vop_symlink_t ufs_symlink; +static vop_whiteout_t ufs_whiteout; +static vop_close_t ufsfifo_close; +static vop_kqfilter_t ufsfifo_kqfilter; +static vop_read_t ufsfifo_read; +static vop_write_t ufsfifo_write; 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); +static vop_kqfilter_t ufs_kqfilter; /* * A virgin directory (no blushing please).