summaryrefslogtreecommitdiff
path: root/sys/ufs/ext2fs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/ufs/ext2fs')
-rw-r--r--sys/ufs/ext2fs/ext2fs.h8
-rw-r--r--sys/ufs/ext2fs/ext2fs_alloc.c14
-rw-r--r--sys/ufs/ext2fs/ext2fs_bmap.c6
-rw-r--r--sys/ufs/ext2fs/ext2fs_dinode.h2
-rw-r--r--sys/ufs/ext2fs/ext2fs_dir.h4
-rw-r--r--sys/ufs/ext2fs/ext2fs_extern.h126
-rw-r--r--sys/ufs/ext2fs/ext2fs_inode.c6
-rw-r--r--sys/ufs/ext2fs/ext2fs_lookup.c10
-rw-r--r--sys/ufs/ext2fs/ext2fs_vfsops.c6
-rw-r--r--sys/ufs/ext2fs/ext2fs_vnops.c24
10 files changed, 102 insertions, 104 deletions
diff --git a/sys/ufs/ext2fs/ext2fs.h b/sys/ufs/ext2fs/ext2fs.h
index 6e97a0684ee..5f5b4fd9494 100644
--- a/sys/ufs/ext2fs/ext2fs.h
+++ b/sys/ufs/ext2fs/ext2fs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs.h,v 1.5 2001/09/18 00:06:21 art Exp $ */
+/* $OpenBSD: ext2fs.h,v 1.6 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs.h,v 1.10 2000/01/28 16:00:23 bouyer Exp $ */
/*
@@ -219,7 +219,7 @@ struct ext2_gd {
* a power of 3, 5 or 7
*/
-static __inline__ int cg_has_sb __P((int)) __attribute__((__unused__));
+static __inline__ int cg_has_sb(int) __attribute__((__unused__));
static __inline int
cg_has_sb(i)
int i;
@@ -251,8 +251,8 @@ cg_has_sb(i)
#define e2fs_sbsave(old, new) memcpy((new), (old), SBSIZE);
#define e2fs_cgsave(old, new, size) memcpy((new), (old), (size));
#else
-void e2fs_sb_bswap __P((struct ext2fs *, struct ext2fs *));
-void e2fs_cg_bswap __P((struct ext2_gd *, struct ext2_gd *, int));
+void e2fs_sb_bswap(struct ext2fs *, struct ext2fs *);
+void e2fs_cg_bswap(struct ext2_gd *, struct ext2_gd *, int);
#define e2fs_sbload(old, new) e2fs_sb_bswap((old), (new))
#define e2fs_cgload(old, new, size) e2fs_cg_bswap((old), (new), (size));
#define e2fs_sbsave(old, new) e2fs_sb_bswap((old), (new))
diff --git a/sys/ufs/ext2fs/ext2fs_alloc.c b/sys/ufs/ext2fs/ext2fs_alloc.c
index 17e0ced02a0..05cc4fca44d 100644
--- a/sys/ufs/ext2fs/ext2fs_alloc.c
+++ b/sys/ufs/ext2fs/ext2fs_alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_alloc.c,v 1.7 2001/09/17 23:25:04 art Exp $ */
+/* $OpenBSD: ext2fs_alloc.c,v 1.8 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_alloc.c,v 1.10 2001/07/05 08:38:27 toshii Exp $ */
/*
@@ -56,14 +56,14 @@
u_long ext2gennumber;
-static ufs_daddr_t ext2fs_alloccg __P((struct inode *, int, ufs_daddr_t, int));
-static u_long ext2fs_dirpref __P((struct m_ext2fs *));
-static void ext2fs_fserr __P((struct m_ext2fs *, u_int, char *));
+static ufs_daddr_t ext2fs_alloccg(struct inode *, int, ufs_daddr_t, int);
+static u_long ext2fs_dirpref(struct m_ext2fs *);
+static void ext2fs_fserr(struct m_ext2fs *, u_int, char *);
static u_long ext2fs_hashalloc __P((struct inode *, int, long, int,
ufs_daddr_t (*)(struct inode *, int, ufs_daddr_t,
int)));
-static ufs_daddr_t ext2fs_nodealloccg __P((struct inode *, int, ufs_daddr_t, int));
-static ufs_daddr_t ext2fs_mapsearch __P((struct m_ext2fs *, char *, ufs_daddr_t));
+static ufs_daddr_t ext2fs_nodealloccg(struct inode *, int, ufs_daddr_t, int);
+static ufs_daddr_t ext2fs_mapsearch(struct m_ext2fs *, char *, ufs_daddr_t);
/*
* Allocate a block in the file system.
@@ -279,7 +279,7 @@ ext2fs_hashalloc(ip, cg, pref, size, allocator)
int cg;
long pref;
int size; /* size for data blocks, mode for inodes */
- ufs_daddr_t (*allocator) __P((struct inode *, int, ufs_daddr_t, int));
+ ufs_daddr_t (*allocator)(struct inode *, int, ufs_daddr_t, int);
{
struct m_ext2fs *fs;
long result;
diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c
index 8f247adf707..20b4cdec845 100644
--- a/sys/ufs/ext2fs/ext2fs_bmap.c
+++ b/sys/ufs/ext2fs/ext2fs_bmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_bmap.c,v 1.7 2002/02/22 20:37:45 drahn Exp $ */
+/* $OpenBSD: ext2fs_bmap.c,v 1.8 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $ */
/*
@@ -61,8 +61,8 @@
#include <ufs/ext2fs/ext2fs.h>
#include <ufs/ext2fs/ext2fs_extern.h>
-static int ext2fs_bmaparray __P((struct vnode *, ufs_daddr_t, ufs_daddr_t *,
- struct indir *, int *, int *));
+static int ext2fs_bmaparray(struct vnode *, ufs_daddr_t, ufs_daddr_t *,
+ struct indir *, int *, int *);
/*
* Bmap converts a the logical block number of a file to its physical block
diff --git a/sys/ufs/ext2fs/ext2fs_dinode.h b/sys/ufs/ext2fs/ext2fs_dinode.h
index e18fb0fb10b..ce14ce7163f 100644
--- a/sys/ufs/ext2fs/ext2fs_dinode.h
+++ b/sys/ufs/ext2fs/ext2fs_dinode.h
@@ -139,7 +139,7 @@ struct ext2fs_dinode {
# define e2fs_iload(old, new) memcpy((new),(old),sizeof(struct ext2fs_dinode))
# define e2fs_isave(old, new) memcpy((new),(old),sizeof(struct ext2fs_dinode))
#else
-void e2fs_i_bswap __P((struct ext2fs_dinode *, struct ext2fs_dinode *));
+void e2fs_i_bswap(struct ext2fs_dinode *, struct ext2fs_dinode *);
# define e2fs_iload(old, new) e2fs_i_bswap((old), (new))
# define e2fs_isave(old, new) e2fs_i_bswap((old), (new))
#endif
diff --git a/sys/ufs/ext2fs/ext2fs_dir.h b/sys/ufs/ext2fs/ext2fs_dir.h
index 2fa12e3d62f..96ece747186 100644
--- a/sys/ufs/ext2fs/ext2fs_dir.h
+++ b/sys/ufs/ext2fs/ext2fs_dir.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_dir.h,v 1.5 2001/09/18 00:25:59 art Exp $ */
+/* $OpenBSD: ext2fs_dir.h,v 1.6 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_dir.h,v 1.4 2000/01/28 16:00:23 bouyer Exp $ */
/*
@@ -105,7 +105,7 @@ struct ext2fs_direct {
#define E2IFTODT(mode) (((mode) & 0170000) >> 12)
-static __inline__ u_int8_t inot2ext2dt __P((u_int16_t))
+static __inline__ u_int8_t inot2ext2dt(u_int16_t)
__attribute__((__unused__));
static __inline__ u_int8_t
inot2ext2dt(type)
diff --git a/sys/ufs/ext2fs/ext2fs_extern.h b/sys/ufs/ext2fs/ext2fs_extern.h
index 5063d34427a..07515696322 100644
--- a/sys/ufs/ext2fs/ext2fs_extern.h
+++ b/sys/ufs/ext2fs/ext2fs_extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_extern.h,v 1.13 2001/12/19 08:58:07 art Exp $ */
+/* $OpenBSD: ext2fs_extern.h,v 1.14 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_extern.h,v 1.1 1997/06/11 09:33:55 bouyer Exp $ */
/*-
@@ -60,15 +60,15 @@ extern struct pool ext2fs_inode_pool; /* memory pool for inodes */
__BEGIN_DECLS
/* ext2fs_alloc.c */
-int ext2fs_alloc __P((struct inode *, ufs_daddr_t, ufs_daddr_t , struct ucred *,
- ufs_daddr_t *));
-int ext2fs_realloccg __P((struct inode *, ufs_daddr_t, ufs_daddr_t, int, int,
- struct ucred *, struct buf **));
-int ext2fs_reallocblks __P((void *));
+int ext2fs_alloc(struct inode *, ufs_daddr_t, ufs_daddr_t , struct ucred *,
+ ufs_daddr_t *);
+int ext2fs_realloccg(struct inode *, ufs_daddr_t, ufs_daddr_t, int, int,
+ struct ucred *, struct buf **);
+int ext2fs_reallocblks(void *);
int ext2fs_inode_alloc(struct inode *pip, int mode, struct ucred *,
struct vnode **);
-daddr_t ext2fs_blkpref __P((struct inode *, ufs_daddr_t, int, ufs_daddr_t *));
-void ext2fs_blkfree __P((struct inode *, ufs_daddr_t));
+daddr_t ext2fs_blkpref(struct inode *, ufs_daddr_t, int, ufs_daddr_t *);
+void ext2fs_blkfree(struct inode *, ufs_daddr_t);
int ext2fs_inode_free(struct inode *pip, ino_t ino, int mode);
/* ext2fs_balloc.c */
@@ -76,85 +76,85 @@ int ext2fs_buf_alloc(struct inode *, daddr_t, int, struct ucred *,
struct buf **, int);
/* ext2fs_bmap.c */
-int ext2fs_bmap __P((void *));
+int ext2fs_bmap(void *);
/* ext2fs_inode.c */
-int ext2fs_init __P((struct vfsconf *));
+int ext2fs_init(struct vfsconf *);
int ext2fs_update(struct inode *ip, struct timespec *atime,
struct timespec *mtime, int waitfor);
int ext2fs_truncate(struct inode *, off_t, int, struct ucred *);
-int ext2fs_inactive __P((void *));
+int ext2fs_inactive(void *);
/* ext2fs_lookup.c */
-int ext2fs_readdir __P((void *));
-int ext2fs_lookup __P((void *));
-int ext2fs_direnter __P((struct inode *, struct vnode *,
- struct componentname *));
-int ext2fs_dirremove __P((struct vnode *, struct componentname *));
-int ext2fs_dirrewrite __P((struct inode *, struct inode *,
- struct componentname *));
-int ext2fs_dirempty __P((struct inode *, ino_t, struct ucred *));
-int ext2fs_checkpath __P((struct inode *, struct inode *, struct ucred *));
+int ext2fs_readdir(void *);
+int ext2fs_lookup(void *);
+int ext2fs_direnter(struct inode *, struct vnode *,
+ struct componentname *);
+int ext2fs_dirremove(struct vnode *, struct componentname *);
+int ext2fs_dirrewrite(struct inode *, struct inode *,
+ struct componentname *);
+int ext2fs_dirempty(struct inode *, ino_t, struct ucred *);
+int ext2fs_checkpath(struct inode *, struct inode *, struct ucred *);
/* ext2fs_subr.c */
int ext2fs_bufatoff(struct inode *, off_t, char **, struct buf **);
-void ext2fs_fragacct __P((struct m_ext2fs *, int, int32_t[], int));
+void ext2fs_fragacct(struct m_ext2fs *, int, int32_t[], int);
#ifdef DIAGNOSTIC
-void ext2fs_checkoverlap __P((struct buf *, struct inode *));
+void ext2fs_checkoverlap(struct buf *, struct inode *);
#endif
/* ext2fs_vfsops.c */
-int ext2fs_mountroot __P((void));
-int ext2fs_mount __P((struct mount *, const char *, void *,
- struct nameidata *, struct proc *));
-int ext2fs_reload __P((struct mount *, struct ucred *, struct proc *));
-int ext2fs_mountfs __P((struct vnode *, struct mount *, struct proc *));
-int ext2fs_unmount __P((struct mount *, int, struct proc *));
-int ext2fs_flushfiles __P((struct mount *, int, struct proc *));
-int ext2fs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int ext2fs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int ext2fs_vget __P((struct mount *, ino_t, struct vnode **));
-int ext2fs_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-int ext2fs_vptofh __P((struct vnode *, struct fid *));
-int ext2fs_sbupdate __P((struct ufsmount *, int));
-int ext2fs_cgupdate __P((struct ufsmount *, int));
-int ext2fs_sysctl __P((int *, u_int, void *, size_t *, void *, size_t,
- struct proc *));
+int ext2fs_mountroot(void);
+int ext2fs_mount(struct mount *, const char *, void *,
+ struct nameidata *, struct proc *);
+int ext2fs_reload(struct mount *, struct ucred *, struct proc *);
+int ext2fs_mountfs(struct vnode *, struct mount *, struct proc *);
+int ext2fs_unmount(struct mount *, int, struct proc *);
+int ext2fs_flushfiles(struct mount *, int, struct proc *);
+int ext2fs_statfs(struct mount *, struct statfs *, struct proc *);
+int ext2fs_sync(struct mount *, int, struct ucred *, struct proc *);
+int ext2fs_vget(struct mount *, ino_t, struct vnode **);
+int ext2fs_fhtovp(struct mount *, struct fid *, struct vnode **);
+int ext2fs_vptofh(struct vnode *, struct fid *);
+int ext2fs_sbupdate(struct ufsmount *, int);
+int ext2fs_cgupdate(struct ufsmount *, int);
+int ext2fs_sysctl(int *, u_int, void *, size_t *, void *, size_t,
+ struct proc *);
/* ext2fs_readwrite.c */
-int ext2fs_read __P((void *));
-int ext2fs_write __P((void *));
+int ext2fs_read(void *);
+int ext2fs_write(void *);
/* ext2fs_vnops.c */
-int ext2fs_create __P((void *));
-int ext2fs_mknod __P((void *));
-int ext2fs_open __P((void *));
-int ext2fs_access __P((void *));
-int ext2fs_getattr __P((void *));
-int ext2fs_setattr __P((void *));
-int ext2fs_remove __P((void *));
-int ext2fs_link __P((void *));
-int ext2fs_rename __P((void *));
-int ext2fs_mkdir __P((void *));
-int ext2fs_rmdir __P((void *));
-int ext2fs_symlink __P((void *));
-int ext2fs_readlink __P((void *));
-int ext2fs_advlock __P((void *));
-int ext2fs_vinit __P((struct mount *, int (**specops) __P((void *)),
- int (**fifoops) __P((void *)), struct vnode **));
-int ext2fs_makeinode __P((int, struct vnode *, struct vnode **,
- struct componentname *cnp));
-int ext2fs_fsync __P((void *));
-int ext2fs_reclaim __P((void *));
+int ext2fs_create(void *);
+int ext2fs_mknod(void *);
+int ext2fs_open(void *);
+int ext2fs_access(void *);
+int ext2fs_getattr(void *);
+int ext2fs_setattr(void *);
+int ext2fs_remove(void *);
+int ext2fs_link(void *);
+int ext2fs_rename(void *);
+int ext2fs_mkdir(void *);
+int ext2fs_rmdir(void *);
+int ext2fs_symlink(void *);
+int ext2fs_readlink(void *);
+int ext2fs_advlock(void *);
+int ext2fs_vinit __P((struct mount *, int (**specops)(void *),
+ int (**fifoops)(void *), struct vnode **));
+int ext2fs_makeinode(int, struct vnode *, struct vnode **,
+ struct componentname *cnp);
+int ext2fs_fsync(void *);
+int ext2fs_reclaim(void *);
__END_DECLS
#define IS_EXT2_VNODE(vp) (vp->v_tag == VT_EXT2FS)
-extern int (**ext2fs_vnodeop_p) __P((void *));
-extern int (**ext2fs_specop_p) __P((void *));
+extern int (**ext2fs_vnodeop_p)(void *);
+extern int (**ext2fs_specop_p)(void *);
#ifdef FIFO
-extern int (**ext2fs_fifoop_p) __P((void *));
+extern int (**ext2fs_fifoop_p)(void *);
#define EXT2FS_FIFOOPS ext2fs_fifoop_p
#else
#define EXT2FS_FIFOOPS NULL
diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index f7eac005b0d..d70f10bce84 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_inode.c,v 1.20 2002/02/22 20:37:45 drahn Exp $ */
+/* $OpenBSD: ext2fs_inode.c,v 1.21 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $ */
/*
@@ -60,8 +60,8 @@
#include <ufs/ext2fs/ext2fs.h>
#include <ufs/ext2fs/ext2fs_extern.h>
-static int ext2fs_indirtrunc __P((struct inode *, ufs_daddr_t, ufs_daddr_t,
- ufs_daddr_t, int, long *));
+static int ext2fs_indirtrunc(struct inode *, ufs_daddr_t, ufs_daddr_t,
+ ufs_daddr_t, int, long *);
/*
* Last reference to an inode. If necessary, write or delete it.
diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c
index 663d5ef8a83..e8e52a3e267 100644
--- a/sys/ufs/ext2fs/ext2fs_lookup.c
+++ b/sys/ufs/ext2fs/ext2fs_lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_lookup.c,v 1.12 2002/02/22 20:37:45 drahn Exp $ */
+/* $OpenBSD: ext2fs_lookup.c,v 1.13 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $ */
/*
@@ -74,11 +74,11 @@
extern int dirchk;
-static void ext2fs_dirconv2ffs __P((struct ext2fs_direct *e2dir,
- struct dirent *ffsdir));
-static int ext2fs_dirbadentry __P((struct vnode *dp,
+static void ext2fs_dirconv2ffs(struct ext2fs_direct *e2dir,
+ struct dirent *ffsdir);
+static int ext2fs_dirbadentry(struct vnode *dp,
struct ext2fs_direct *de,
- int entryoffsetinblock));
+ int entryoffsetinblock);
/*
* the problem that is tackled below is the fact that FFS
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 09df6e06183..41a1db6eab3 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vfsops.c,v 1.21 2002/02/22 20:37:45 drahn Exp $ */
+/* $OpenBSD: ext2fs_vfsops.c,v 1.22 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */
/*
@@ -71,8 +71,8 @@
extern struct lock ufs_hashlock;
-int ext2fs_sbupdate __P((struct ufsmount *, int));
-static int ext2fs_checksb __P((struct ext2fs *, int));
+int ext2fs_sbupdate(struct ufsmount *, int);
+static int ext2fs_checksb(struct ext2fs *, int);
extern struct vnodeopv_desc ext2fs_vnodeop_opv_desc;
extern struct vnodeopv_desc ext2fs_specop_opv_desc;
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c
index 43ef065c46f..8e9187a32c0 100644
--- a/sys/ufs/ext2fs/ext2fs_vnops.c
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vnops.c,v 1.22 2002/02/22 20:37:45 drahn Exp $ */
+/* $OpenBSD: ext2fs_vnops.c,v 1.23 2002/03/14 01:27:14 millert Exp $ */
/* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */
/*
@@ -76,10 +76,8 @@
#include <ufs/ext2fs/ext2fs_dir.h>
-static int ext2fs_chmod
- __P((struct vnode *, int, struct ucred *, struct proc *));
-static int ext2fs_chown
- __P((struct vnode *, uid_t, gid_t, struct ucred *, struct proc *));
+static int ext2fs_chmod(struct vnode *, int, struct ucred *, struct proc *);
+static int ext2fs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct proc *);
union _qcvt {
int64_t qcvt;
@@ -1247,8 +1245,8 @@ ext2fs_advlock(v)
int
ext2fs_vinit(mntp, specops, fifoops, vpp)
struct mount *mntp;
- int (**specops) __P((void *));
- int (**fifoops) __P((void *));
+ int (**specops)(void *);
+ int (**fifoops)(void *);
struct vnode **vpp;
{
struct inode *ip;
@@ -1432,7 +1430,7 @@ ext2fs_reclaim(v)
}
/* Global vfs data structures for ext2fs. */
-int (**ext2fs_vnodeop_p) __P((void *));
+int (**ext2fs_vnodeop_p)(void *);
struct vnodeopv_entry_desc ext2fs_vnodeop_entries[] = {
{ &vop_default_desc, vn_default_error },
{ &vop_lookup_desc, ext2fs_lookup }, /* lookup */
@@ -1470,12 +1468,12 @@ struct vnodeopv_entry_desc ext2fs_vnodeop_entries[] = {
{ &vop_pathconf_desc, ufs_pathconf }, /* pathconf */
{ &vop_advlock_desc, ext2fs_advlock }, /* advlock */
{ &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */
- { (struct vnodeop_desc*)NULL, (int(*) __P((void*)))NULL }
+ { (struct vnodeop_desc*)NULL, (int(*)(void*))NULL }
};
struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
{ &ext2fs_vnodeop_p, ext2fs_vnodeop_entries };
-int (**ext2fs_specop_p) __P((void *));
+int (**ext2fs_specop_p)(void *);
struct vnodeopv_entry_desc ext2fs_specop_entries[] = {
{ &vop_default_desc, vn_default_error },
{ &vop_lookup_desc, spec_lookup }, /* lookup */
@@ -1513,13 +1511,13 @@ struct vnodeopv_entry_desc ext2fs_specop_entries[] = {
{ &vop_pathconf_desc, spec_pathconf }, /* pathconf */
{ &vop_advlock_desc, spec_advlock }, /* advlock */
{ &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */
- { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+ { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
};
struct vnodeopv_desc ext2fs_specop_opv_desc =
{ &ext2fs_specop_p, ext2fs_specop_entries };
#ifdef FIFO
-int (**ext2fs_fifoop_p) __P((void *));
+int (**ext2fs_fifoop_p)(void *);
struct vnodeopv_entry_desc ext2fs_fifoop_entries[] = {
{ &vop_default_desc, vn_default_error },
{ &vop_lookup_desc, fifo_lookup }, /* lookup */
@@ -1557,7 +1555,7 @@ struct vnodeopv_entry_desc ext2fs_fifoop_entries[] = {
{ &vop_pathconf_desc, fifo_pathconf }, /* pathconf */
{ &vop_advlock_desc, fifo_advlock }, /* advlock */
{ &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */
- { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+ { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
};
struct vnodeopv_desc ext2fs_fifoop_opv_desc =
{ &ext2fs_fifoop_p, ext2fs_fifoop_entries };