summaryrefslogtreecommitdiff
path: root/sys/miscfs/umapfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/miscfs/umapfs')
-rw-r--r--sys/miscfs/umapfs/umap.h14
-rw-r--r--sys/miscfs/umapfs/umap_subr.c12
-rw-r--r--sys/miscfs/umapfs/umap_vfsops.c34
-rw-r--r--sys/miscfs/umapfs/umap_vnops.c24
4 files changed, 42 insertions, 42 deletions
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 4b9e9971884..7b879f8f162 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: umap.h,v 1.8 1997/11/06 05:58:46 csapuntz Exp $ */
+/* $OpenBSD: umap.h,v 1.9 2002/03/14 01:27:08 millert Exp $ */
/* $NetBSD: umap.h,v 1.6 1996/02/09 22:41:00 christos Exp $ */
/*
@@ -77,23 +77,23 @@ struct umap_node {
struct vnode *umap_vnode; /* Back pointer to vnode/umap_node */
};
-extern int umap_node_create __P((struct mount *mp, struct vnode *target, struct vnode **vpp));
-extern id_t umap_reverse_findid __P((id_t id, id_map_t, int nentries));
-extern void umap_mapids __P((struct mount *v_mount, struct ucred *credp));
+extern int umap_node_create(struct mount *mp, struct vnode *target, struct vnode **vpp);
+extern id_t umap_reverse_findid(id_t id, id_map_t, 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 UMAPFS_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)
#endif
-extern int (**umap_vnodeop_p) __P((void *));
+extern int (**umap_vnodeop_p)(void *);
extern struct vfsops umap_vfsops;
-int umapfs_init __P((struct vfsconf *));
+int umapfs_init(struct vfsconf *);
#endif /* _KERNEL */
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index d88c78fa709..55ccfd14a66 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umap_subr.c,v 1.12 1999/04/28 09:28:15 art Exp $ */
+/* $OpenBSD: umap_subr.c,v 1.13 2002/03/14 01:27:08 millert Exp $ */
/* $NetBSD: umap_subr.c,v 1.8 1996/03/05 02:35:39 thorpej Exp $ */
/*
@@ -68,10 +68,10 @@
LIST_HEAD(umap_node_hashhead, umap_node) *umap_node_hashtbl;
u_long umap_node_hash;
-static id_t umap_findid __P((id_t, id_map_t, int));
-static struct vnode *umap_node_find __P((struct mount *, struct vnode *));
-static int umap_node_alloc __P((struct mount *, struct vnode *,
- struct vnode **));
+static id_t umap_findid(id_t, id_map_t, int);
+static struct vnode *umap_node_find(struct mount *, struct vnode *);
+static int umap_node_alloc(struct mount *, struct vnode *,
+ struct vnode **);
/*
* Initialise cache headers
@@ -202,7 +202,7 @@ umap_node_alloc(mp, lowervp, vpp)
struct vnode *vp, *nvp;
int error;
struct proc *p = curproc;
- extern int (**dead_vnodeop_p) __P((void *));
+ extern int (**dead_vnodeop_p)(void *);
if ((error = getnewvnode(VT_UMAP, mp, umap_vnodeop_p, &vp)) != 0)
return (error);
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index ee5f9efc82b..88bc06db3bc 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umap_vfsops.c,v 1.17 2001/09/16 00:42:44 millert Exp $ */
+/* $OpenBSD: umap_vfsops.c,v 1.18 2002/03/14 01:27:08 millert Exp $ */
/* $NetBSD: umap_vfsops.c,v 1.9 1996/02/09 22:41:05 christos Exp $ */
/*
@@ -56,18 +56,18 @@
#include <sys/malloc.h>
#include <miscfs/umapfs/umap.h>
-int umapfs_mount __P((struct mount *, const char *, void *,
- struct nameidata *, struct proc *));
-int umapfs_start __P((struct mount *, int, struct proc *));
-int umapfs_unmount __P((struct mount *, int, struct proc *));
-int umapfs_root __P((struct mount *, struct vnode **));
-int umapfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
- struct proc *));
-int umapfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int umapfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int umapfs_vget __P((struct mount *, ino_t, struct vnode **));
-int umapfs_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-int umapfs_vptofh __P((struct vnode *, struct fid *));
+int umapfs_mount(struct mount *, const char *, void *,
+ struct nameidata *, struct proc *);
+int umapfs_start(struct mount *, int, struct proc *);
+int umapfs_unmount(struct mount *, int, struct proc *);
+int umapfs_root(struct mount *, struct vnode **);
+int umapfs_quotactl(struct mount *, int, uid_t, caddr_t,
+ struct proc *);
+int umapfs_statfs(struct mount *, struct statfs *, struct proc *);
+int umapfs_sync(struct mount *, int, struct ucred *, struct proc *);
+int umapfs_vget(struct mount *, ino_t, struct vnode **);
+int umapfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+int umapfs_vptofh(struct vnode *, struct fid *);
/*
* Mount umap layer
@@ -411,10 +411,10 @@ umapfs_vptofh(vp, fhp)
return VFS_VPTOFH(UMAPVPTOLOWERVP(vp), fhp);
}
-#define umapfs_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
- size_t, struct proc *)))eopnotsupp)
-#define umapfs_checkexp ((int (*) __P((struct mount *, struct mbuf *, \
- int *, struct ucred **)))eopnotsupp)
+#define umapfs_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \
+ size_t, struct proc *))eopnotsupp)
+#define umapfs_checkexp ((int (*)(struct mount *, struct mbuf *, \
+ int *, struct ucred **))eopnotsupp)
struct vfsops umap_vfsops = {
umapfs_mount,
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index 9b545d0cdc8..549621bdb1f 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umap_vnops.c,v 1.13 2001/12/04 22:44:32 art Exp $ */
+/* $OpenBSD: umap_vnops.c,v 1.14 2002/03/14 01:27:08 millert Exp $ */
/* $NetBSD: umap_vnops.c,v 1.5.4.1 1996/05/25 22:13:35 jtc Exp $ */
/*
@@ -58,16 +58,16 @@
int umap_bug_bypass = 0; /* for debugging: enables bypass printf'ing */
-int umap_bypass __P((void *));
-int umap_getattr __P((void *));
-int umap_inactive __P((void *));
-int umap_reclaim __P((void *));
-int umap_print __P((void *));
-int umap_rename __P((void *));
-int umap_strategy __P((void *));
-int umap_bwrite __P((void *));
-int umap_unlock __P((void *));
-int umap_lock __P((void *));
+int umap_bypass(void *);
+int umap_getattr(void *);
+int umap_inactive(void *);
+int umap_reclaim(void *);
+int umap_print(void *);
+int umap_rename(void *);
+int umap_strategy(void *);
+int umap_bwrite(void *);
+int umap_unlock(void *);
+int umap_lock(void *);
/*
* Global vfs data structures
@@ -77,7 +77,7 @@ int umap_lock __P((void *));
* go away with a merged buffer/block cache.
*
*/
-int (**umap_vnodeop_p) __P((void *));
+int (**umap_vnodeop_p)(void *);
struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
{ &vop_default_desc, umap_bypass },
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 19:42:01 +0000