summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbp <bp@FreeBSD.org>2000-09-05 07:54:39 +0000
committerbp <bp@FreeBSD.org>2000-09-05 07:54:39 +0000
commit7106b8bf8a4049b6fe4ceaaa93f7691fe1be1920 (patch)
tree84a21dac5cf261138aec9a34408ad04476c4cb8a /sys
parent81eb6ee3cf8a30f5669bbf89538ad5605f839c63 (diff)
downloadFreeBSD-src-7106b8bf8a4049b6fe4ceaaa93f7691fe1be1920.zip
FreeBSD-src-7106b8bf8a4049b6fe4ceaaa93f7691fe1be1920.tar.gz
Get rid from the __P() macros.
Encouraged by: peter
Diffstat (limited to 'sys')
-rw-r--r--sys/fs/nullfs/null.h13
-rw-r--r--sys/fs/nullfs/null_subr.c6
-rw-r--r--sys/fs/nullfs/null_vfsops.c36
-rw-r--r--sys/fs/nullfs/null_vnops.c18
-rw-r--r--sys/miscfs/nullfs/null.h13
-rw-r--r--sys/miscfs/nullfs/null_subr.c6
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c36
-rw-r--r--sys/miscfs/nullfs/null_vnops.c18
8 files changed, 72 insertions, 74 deletions
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index 2b7ed51..f825ee8 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -57,20 +57,21 @@ struct null_node {
struct vnode *null_vnode; /* Back pointer */
};
-extern int nullfs_init __P((struct vfsconf *vfsp));
-extern int null_node_create __P((struct mount *mp, struct vnode *target, struct vnode **vpp));
-
#define MOUNTTONULLMOUNT(mp) ((struct null_mount *)((mp)->mnt_data))
#define VTONULL(vp) ((struct null_node *)(vp)->v_data)
#define NULLTOV(xp) ((xp)->null_vnode)
+
+int nullfs_init(struct vfsconf *vfsp);
+int null_node_create(struct mount *mp, struct vnode *target, struct vnode **vpp);
+int null_bypass(struct vop_generic_args *ap);
+
#ifdef DIAGNOSTIC
-extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
+struct vnode *null_checkvp(struct vnode *vp, char *fil, int lno);
#define NULLVPTOLOWERVP(vp) null_checkvp((vp), __FILE__, __LINE__)
#else
#define NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
#endif
-extern int null_bypass __P((struct vop_generic_args *ap));
-
extern vop_t **null_vnodeop_p;
+
#endif /* _KERNEL */
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index ad37a1e..900bd15 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -62,10 +62,10 @@
static LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl;
static u_long null_node_hash;
-static int null_node_alloc __P((struct mount *mp, struct vnode *lowervp,
- struct vnode **vpp));
+static int null_node_alloc(struct mount *mp, struct vnode *lowervp,
+ struct vnode **vpp);
static struct vnode *
- null_node_find __P((struct mount *mp, struct vnode *lowervp));
+ null_node_find(struct mount *mp, struct vnode *lowervp);
/*
* Initialise cache headers
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 43e0e84..754a121 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -56,25 +56,23 @@
static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure");
-static int nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
- struct vnode **vpp));
-static int nullfs_checkexp __P((struct mount *mp, struct sockaddr *nam,
- int *extflagsp, struct ucred **credanonp));
-static int nullfs_mount __P((struct mount *mp, char *path, caddr_t data,
- struct nameidata *ndp, struct proc *p));
-static int nullfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
- caddr_t arg, struct proc *p));
-static int nullfs_root __P((struct mount *mp, struct vnode **vpp));
-static int nullfs_start __P((struct mount *mp, int flags, struct proc *p));
-static int nullfs_statfs __P((struct mount *mp, struct statfs *sbp,
- struct proc *p));
-static int nullfs_sync __P((struct mount *mp, int waitfor,
- struct ucred *cred, struct proc *p));
-static int nullfs_unmount __P((struct mount *mp, int mntflags,
- struct proc *p));
-static int nullfs_vget __P((struct mount *mp, ino_t ino,
- struct vnode **vpp));
-static int nullfs_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int nullfs_fhtovp(struct mount *mp, struct fid *fidp,
+ struct vnode **vpp);
+static int nullfs_checkexp(struct mount *mp, struct sockaddr *nam,
+ int *extflagsp, struct ucred **credanonp);
+static int nullfs_mount(struct mount *mp, char *path, caddr_t data,
+ struct nameidata *ndp, struct proc *p);
+static int nullfs_quotactl(struct mount *mp, int cmd, uid_t uid,
+ caddr_t arg, struct proc *p);
+static int nullfs_root(struct mount *mp, struct vnode **vpp);
+static int nullfs_start(struct mount *mp, int flags, struct proc *p);
+static int nullfs_statfs(struct mount *mp, struct statfs *sbp,
+ struct proc *p);
+static int nullfs_sync(struct mount *mp, int waitfor,
+ struct ucred *cred, struct proc *p);
+static int nullfs_unmount(struct mount *mp, int mntflags, struct proc *p);
+static int nullfs_vget(struct mount *mp, ino_t ino, struct vnode **vpp);
+static int nullfs_vptofh(struct vnode *vp, struct fid *fhp);
/*
* Mount null layer
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 9861733..8329d5e 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -188,15 +188,15 @@ 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 __P((struct vop_access_args *ap));
-static int null_getattr __P((struct vop_getattr_args *ap));
-static int null_inactive __P((struct vop_inactive_args *ap));
-static int null_lock __P((struct vop_lock_args *ap));
-static int null_lookup __P((struct vop_lookup_args *ap));
-static int null_print __P((struct vop_print_args *ap));
-static int null_reclaim __P((struct vop_reclaim_args *ap));
-static int null_setattr __P((struct vop_setattr_args *ap));
-static int null_unlock __P((struct vop_unlock_args *ap));
+static int null_access(struct vop_access_args *ap);
+static int null_getattr(struct vop_getattr_args *ap);
+static int null_inactive(struct vop_inactive_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_setattr(struct vop_setattr_args *ap);
+static int null_unlock(struct vop_unlock_args *ap);
/*
* This is the 10-Apr-92 bypass routine.
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index 2b7ed51..f825ee8 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -57,20 +57,21 @@ struct null_node {
struct vnode *null_vnode; /* Back pointer */
};
-extern int nullfs_init __P((struct vfsconf *vfsp));
-extern int null_node_create __P((struct mount *mp, struct vnode *target, struct vnode **vpp));
-
#define MOUNTTONULLMOUNT(mp) ((struct null_mount *)((mp)->mnt_data))
#define VTONULL(vp) ((struct null_node *)(vp)->v_data)
#define NULLTOV(xp) ((xp)->null_vnode)
+
+int nullfs_init(struct vfsconf *vfsp);
+int null_node_create(struct mount *mp, struct vnode *target, struct vnode **vpp);
+int null_bypass(struct vop_generic_args *ap);
+
#ifdef DIAGNOSTIC
-extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
+struct vnode *null_checkvp(struct vnode *vp, char *fil, int lno);
#define NULLVPTOLOWERVP(vp) null_checkvp((vp), __FILE__, __LINE__)
#else
#define NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
#endif
-extern int null_bypass __P((struct vop_generic_args *ap));
-
extern vop_t **null_vnodeop_p;
+
#endif /* _KERNEL */
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index ad37a1e..900bd15 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -62,10 +62,10 @@
static LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl;
static u_long null_node_hash;
-static int null_node_alloc __P((struct mount *mp, struct vnode *lowervp,
- struct vnode **vpp));
+static int null_node_alloc(struct mount *mp, struct vnode *lowervp,
+ struct vnode **vpp);
static struct vnode *
- null_node_find __P((struct mount *mp, struct vnode *lowervp));
+ null_node_find(struct mount *mp, struct vnode *lowervp);
/*
* Initialise cache headers
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 43e0e84..754a121 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -56,25 +56,23 @@
static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure");
-static int nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
- struct vnode **vpp));
-static int nullfs_checkexp __P((struct mount *mp, struct sockaddr *nam,
- int *extflagsp, struct ucred **credanonp));
-static int nullfs_mount __P((struct mount *mp, char *path, caddr_t data,
- struct nameidata *ndp, struct proc *p));
-static int nullfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
- caddr_t arg, struct proc *p));
-static int nullfs_root __P((struct mount *mp, struct vnode **vpp));
-static int nullfs_start __P((struct mount *mp, int flags, struct proc *p));
-static int nullfs_statfs __P((struct mount *mp, struct statfs *sbp,
- struct proc *p));
-static int nullfs_sync __P((struct mount *mp, int waitfor,
- struct ucred *cred, struct proc *p));
-static int nullfs_unmount __P((struct mount *mp, int mntflags,
- struct proc *p));
-static int nullfs_vget __P((struct mount *mp, ino_t ino,
- struct vnode **vpp));
-static int nullfs_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int nullfs_fhtovp(struct mount *mp, struct fid *fidp,
+ struct vnode **vpp);
+static int nullfs_checkexp(struct mount *mp, struct sockaddr *nam,
+ int *extflagsp, struct ucred **credanonp);
+static int nullfs_mount(struct mount *mp, char *path, caddr_t data,
+ struct nameidata *ndp, struct proc *p);
+static int nullfs_quotactl(struct mount *mp, int cmd, uid_t uid,
+ caddr_t arg, struct proc *p);
+static int nullfs_root(struct mount *mp, struct vnode **vpp);
+static int nullfs_start(struct mount *mp, int flags, struct proc *p);
+static int nullfs_statfs(struct mount *mp, struct statfs *sbp,
+ struct proc *p);
+static int nullfs_sync(struct mount *mp, int waitfor,
+ struct ucred *cred, struct proc *p);
+static int nullfs_unmount(struct mount *mp, int mntflags, struct proc *p);
+static int nullfs_vget(struct mount *mp, ino_t ino, struct vnode **vpp);
+static int nullfs_vptofh(struct vnode *vp, struct fid *fhp);
/*
* Mount null layer
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 9861733..8329d5e 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -188,15 +188,15 @@ 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 __P((struct vop_access_args *ap));
-static int null_getattr __P((struct vop_getattr_args *ap));
-static int null_inactive __P((struct vop_inactive_args *ap));
-static int null_lock __P((struct vop_lock_args *ap));
-static int null_lookup __P((struct vop_lookup_args *ap));
-static int null_print __P((struct vop_print_args *ap));
-static int null_reclaim __P((struct vop_reclaim_args *ap));
-static int null_setattr __P((struct vop_setattr_args *ap));
-static int null_unlock __P((struct vop_unlock_args *ap));
+static int null_access(struct vop_access_args *ap);
+static int null_getattr(struct vop_getattr_args *ap);
+static int null_inactive(struct vop_inactive_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_setattr(struct vop_setattr_args *ap);
+static int null_unlock(struct vop_unlock_args *ap);
/*
* This is the 10-Apr-92 bypass routine.
OpenPOWER on IntegriCloud