diff options
author | alfred <alfred@FreeBSD.org> | 2002-03-19 22:20:14 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-03-19 22:20:14 +0000 |
commit | 1446d094292532062a83b8dc4587f9b62a6120df (patch) | |
tree | cf7078f9ddebb58cb7cd55dcd736f1f25c75ac7f /sys/fs/unionfs | |
parent | c147e70b997febc0da8565eecf0dabede1ba5f88 (diff) | |
download | FreeBSD-src-1446d094292532062a83b8dc4587f9b62a6120df.zip FreeBSD-src-1446d094292532062a83b8dc4587f9b62a6120df.tar.gz |
Remove __P.
Diffstat (limited to 'sys/fs/unionfs')
-rw-r--r-- | sys/fs/unionfs/union.h | 40 | ||||
-rw-r--r-- | sys/fs/unionfs/union_subr.c | 34 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 16 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vnops.c | 76 |
4 files changed, 83 insertions, 83 deletions
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h index 0caff1a..12d3ef3 100644 --- a/sys/fs/unionfs/union.h +++ b/sys/fs/unionfs/union.h @@ -113,29 +113,29 @@ struct union_node { #define UNVP_WANT 0x01 #define UNVP_LOCKED 0x02 -extern int union_allocvp __P((struct vnode **, struct mount *, +extern int union_allocvp(struct vnode **, struct mount *, struct vnode *, struct vnode *, struct componentname *, struct vnode *, - struct vnode *, int)); -extern int union_freevp __P((struct vnode *)); -extern struct vnode *union_dircache __P((struct vnode *, struct thread *)); -extern int union_copyup __P((struct union_node *, int, struct ucred *, - struct thread *)); -extern int union_dowhiteout __P((struct union_node *, struct ucred *, - struct thread *)); -extern int union_mkshadow __P((struct union_mount *, struct vnode *, - struct componentname *, struct vnode **)); -extern int union_mkwhiteout __P((struct union_mount *, struct vnode *, - struct componentname *, char *)); -extern int union_cn_close __P((struct vnode *, int, struct ucred *, - struct thread *)); -extern void union_removed_upper __P((struct union_node *un)); -extern struct vnode *union_lowervp __P((struct vnode *)); -extern void union_newsize __P((struct vnode *, off_t, off_t)); - -extern int (*union_dircheckp) __P((struct thread *, struct vnode **, - struct file *)); + struct vnode *, int); +extern int union_freevp(struct vnode *); +extern struct vnode *union_dircache(struct vnode *, struct thread *); +extern int union_copyup(struct union_node *, int, struct ucred *, + struct thread *); +extern int union_dowhiteout(struct union_node *, struct ucred *, + struct thread *); +extern int union_mkshadow(struct union_mount *, struct vnode *, + struct componentname *, struct vnode **); +extern int union_mkwhiteout(struct union_mount *, struct vnode *, + struct componentname *, char *); +extern int union_cn_close(struct vnode *, int, struct ucred *, + struct thread *); +extern void union_removed_upper(struct union_node *un); +extern struct vnode *union_lowervp(struct vnode *); +extern void union_newsize(struct vnode *, off_t, off_t); + +extern int (*union_dircheckp)(struct thread *, struct vnode **, + struct file *); #define MOUNTTOUNIONMOUNT(mp) ((struct union_mount *)((mp)->mnt_data)) #define VTOUNION(vp) ((struct union_node *)(vp)->v_data) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index fde7df5..e5eb7d0 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -62,7 +62,7 @@ #include <sys/proc.h> -extern int union_init __P((void)); +extern int union_init(void); /* must be power of two, otherwise change UNION_HASH() */ #define NHASH 32 @@ -74,26 +74,26 @@ extern int union_init __P((void)); static LIST_HEAD(unhead, union_node) unhead[NHASH]; static int unvplock[NHASH]; -static void union_dircache_r __P((struct vnode *vp, struct vnode ***vppp, - int *cntp)); -static int union_list_lock __P((int ix)); -static void union_list_unlock __P((int ix)); -static int union_relookup __P((struct union_mount *um, struct vnode *dvp, +static void union_dircache_r(struct vnode *vp, struct vnode ***vppp, + int *cntp); +static int union_list_lock(int ix); +static void union_list_unlock(int ix); +static int union_relookup(struct union_mount *um, struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, struct componentname *cn, char *path, - int pathlen)); -static void union_updatevp __P((struct union_node *un, + int pathlen); +static void union_updatevp(struct union_node *un, struct vnode *uppervp, - struct vnode *lowervp)); -static void union_newlower __P((struct union_node *, struct vnode *)); -static void union_newupper __P((struct union_node *, struct vnode *)); -static int union_copyfile __P((struct vnode *, struct vnode *, - struct ucred *, struct thread *)); -static int union_vn_create __P((struct vnode **, struct union_node *, - struct thread *)); -static int union_vn_close __P((struct vnode *, int, struct ucred *, - struct thread *)); + struct vnode *lowervp); +static void union_newlower(struct union_node *, struct vnode *); +static void union_newupper(struct union_node *, struct vnode *); +static int union_copyfile(struct vnode *, struct vnode *, + struct ucred *, struct thread *); +static int union_vn_create(struct vnode **, struct union_node *, + struct thread *); +static int union_vn_close(struct vnode *, int, struct ucred *, + struct thread *); int union_init() diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 58f283b..eb48b69 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -57,14 +57,14 @@ static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure"); -extern int union_init __P((struct vfsconf *)); -static int union_mount __P((struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td)); -static int union_root __P((struct mount *mp, struct vnode **vpp)); -static int union_statfs __P((struct mount *mp, struct statfs *sbp, - struct thread *td)); -static int union_unmount __P((struct mount *mp, int mntflags, - struct thread *td)); +extern int union_init(struct vfsconf *); +static int union_mount(struct mount *mp, char *path, caddr_t data, + struct nameidata *ndp, struct thread *td); +static int union_root(struct mount *mp, struct vnode **vpp); +static int union_statfs(struct mount *mp, struct statfs *sbp, + struct thread *td); +static int union_unmount(struct mount *mp, int mntflags, + struct thread *td); /* * Mount union filesystem diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 1fbdc50..8035799 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -67,45 +67,45 @@ SYSCTL_INT(_vfs, OID_AUTO, uniondebug, CTLFLAG_RW, &uniondebug, 0, ""); SYSCTL_INT(_vfs, OID_AUTO, uniondebug, CTLFLAG_RD, &uniondebug, 0, ""); #endif -static int union_access __P((struct vop_access_args *ap)); -static int union_advlock __P((struct vop_advlock_args *ap)); -static int union_close __P((struct vop_close_args *ap)); -static int union_create __P((struct vop_create_args *ap)); -static int union_createvobject __P((struct vop_createvobject_args *ap)); -static int union_destroyvobject __P((struct vop_destroyvobject_args *ap)); -static int union_fsync __P((struct vop_fsync_args *ap)); -static int union_getattr __P((struct vop_getattr_args *ap)); -static int union_getvobject __P((struct vop_getvobject_args *ap)); -static int union_inactive __P((struct vop_inactive_args *ap)); -static int union_ioctl __P((struct vop_ioctl_args *ap)); -static int union_lease __P((struct vop_lease_args *ap)); -static int union_link __P((struct vop_link_args *ap)); -static int union_lock __P((struct vop_lock_args *ap)); -static int union_lookup __P((struct vop_lookup_args *ap)); -static int union_lookup1 __P((struct vnode *udvp, struct vnode **dvp, +static int union_access(struct vop_access_args *ap); +static int union_advlock(struct vop_advlock_args *ap); +static int union_close(struct vop_close_args *ap); +static int union_create(struct vop_create_args *ap); +static int union_createvobject(struct vop_createvobject_args *ap); +static int union_destroyvobject(struct vop_destroyvobject_args *ap); +static int union_fsync(struct vop_fsync_args *ap); +static int union_getattr(struct vop_getattr_args *ap); +static int union_getvobject(struct vop_getvobject_args *ap); +static int union_inactive(struct vop_inactive_args *ap); +static int union_ioctl(struct vop_ioctl_args *ap); +static int union_lease(struct vop_lease_args *ap); +static int union_link(struct vop_link_args *ap); +static int union_lock(struct vop_lock_args *ap); +static int union_lookup(struct vop_lookup_args *ap); +static int union_lookup1(struct vnode *udvp, struct vnode **dvp, struct vnode **vpp, - struct componentname *cnp)); -static int union_mkdir __P((struct vop_mkdir_args *ap)); -static int union_mknod __P((struct vop_mknod_args *ap)); -static int union_open __P((struct vop_open_args *ap)); -static int union_pathconf __P((struct vop_pathconf_args *ap)); -static int union_print __P((struct vop_print_args *ap)); -static int union_read __P((struct vop_read_args *ap)); -static int union_readdir __P((struct vop_readdir_args *ap)); -static int union_readlink __P((struct vop_readlink_args *ap)); -static int union_getwritemount __P((struct vop_getwritemount_args *ap)); -static int union_reclaim __P((struct vop_reclaim_args *ap)); -static int union_remove __P((struct vop_remove_args *ap)); -static int union_rename __P((struct vop_rename_args *ap)); -static int union_revoke __P((struct vop_revoke_args *ap)); -static int union_rmdir __P((struct vop_rmdir_args *ap)); -static int union_poll __P((struct vop_poll_args *ap)); -static int union_setattr __P((struct vop_setattr_args *ap)); -static int union_strategy __P((struct vop_strategy_args *ap)); -static int union_symlink __P((struct vop_symlink_args *ap)); -static int union_unlock __P((struct vop_unlock_args *ap)); -static int union_whiteout __P((struct vop_whiteout_args *ap)); -static int union_write __P((struct vop_read_args *ap)); + struct componentname *cnp); +static int union_mkdir(struct vop_mkdir_args *ap); +static int union_mknod(struct vop_mknod_args *ap); +static int union_open(struct vop_open_args *ap); +static int union_pathconf(struct vop_pathconf_args *ap); +static int union_print(struct vop_print_args *ap); +static int union_read(struct vop_read_args *ap); +static int union_readdir(struct vop_readdir_args *ap); +static int union_readlink(struct vop_readlink_args *ap); +static int union_getwritemount(struct vop_getwritemount_args *ap); +static int union_reclaim(struct vop_reclaim_args *ap); +static int union_remove(struct vop_remove_args *ap); +static int union_rename(struct vop_rename_args *ap); +static int union_revoke(struct vop_revoke_args *ap); +static int union_rmdir(struct vop_rmdir_args *ap); +static int union_poll(struct vop_poll_args *ap); +static int union_setattr(struct vop_setattr_args *ap); +static int union_strategy(struct vop_strategy_args *ap); +static int union_symlink(struct vop_symlink_args *ap); +static int union_unlock(struct vop_unlock_args *ap); +static int union_whiteout(struct vop_whiteout_args *ap); +static int union_write(struct vop_read_args *ap); static __inline struct vnode * |