Remove __P.

16 files changed, 168 insertions, 168 deletions

diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index f078e04..efba13e 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -60,7 +60,7 @@
 #include <gnu/ext2fs/fs.h>
 #include <gnu/ext2fs/ext2_extern.h>
 
-static void	ext2_fserr __P((struct ext2_sb_info *, u_int, char *));
+static void	ext2_fserr(struct ext2_sb_info *, u_int, char *);
 
 /*
  * Linux calls this functions at the following locations:
diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h
index 580683b..65fbad4 100644
--- a/sys/gnu/ext2fs/ext2_extern.h
+++ b/sys/gnu/ext2fs/ext2_extern.h
@@ -50,49 +50,49 @@ struct mount;
 struct vfsconf;
 struct vnode;
 
-int	ext2_alloc __P((struct inode *,
-	    daddr_t, daddr_t, int, struct ucred *, daddr_t *));
-int	ext2_balloc __P((struct inode *,
-	    daddr_t, int, struct ucred *, struct buf **, int));
-int	ext2_blkatoff __P((struct vnode *, off_t, char **, struct buf **));
-void	ext2_blkfree __P((struct inode *, daddr_t, long));
-daddr_t	ext2_blkpref __P((struct inode *, daddr_t, int, daddr_t *, daddr_t));
-int	ext2_bmap __P((struct vop_bmap_args *));
-int	ext2_init __P((struct vfsconf *));
-int	ext2_reallocblks __P((struct vop_reallocblks_args *));
-int	ext2_reclaim __P((struct vop_reclaim_args *));
-void	ext2_setblock __P((struct ext2_sb_info *, u_char *, daddr_t));
-int	ext2_truncate __P((struct vnode *, off_t, int, struct ucred *, struct thread *));
-int	ext2_update __P((struct vnode *, int));
-int	ext2_valloc __P((struct vnode *, int, struct ucred *, struct vnode **));
-int	ext2_vfree __P((struct vnode *, ino_t, int));
-int 	ext2_lookup __P((struct vop_cachedlookup_args *));
-int 	ext2_readdir __P((struct vop_readdir_args *));
-void	ext2_print_dinode __P((struct dinode *));
-void	ext2_print_inode __P((struct inode *));
-int	ext2_direnter __P((struct inode *, 
-		struct vnode *, struct componentname *));
-int	ext2_dirremove __P((struct vnode *, struct componentname *));
-int	ext2_dirrewrite __P((struct inode *,
-		struct inode *, struct componentname *));
-int	ext2_dirempty __P((struct inode *, ino_t, struct ucred *));
-int	ext2_checkpath __P((struct inode *, struct inode *, struct ucred *));
-struct  ext2_group_desc * get_group_desc __P((struct mount * , 
-		unsigned int , struct buf ** ));
-int	ext2_group_sparse __P((int group));
-void	ext2_discard_prealloc __P((struct inode *));
-int	ext2_inactive __P((struct vop_inactive_args *));
-int	ext2_new_block __P ((struct mount * mp, unsigned long goal,
+int	ext2_alloc(struct inode *,
+	    daddr_t, daddr_t, int, struct ucred *, daddr_t *);
+int	ext2_balloc(struct inode *,
+	    daddr_t, int, struct ucred *, struct buf **, int);
+int	ext2_blkatoff(struct vnode *, off_t, char **, struct buf **);
+void	ext2_blkfree(struct inode *, daddr_t, long);
+daddr_t	ext2_blkpref(struct inode *, daddr_t, int, daddr_t *, daddr_t);
+int	ext2_bmap(struct vop_bmap_args *);
+int	ext2_init(struct vfsconf *);
+int	ext2_reallocblks(struct vop_reallocblks_args *);
+int	ext2_reclaim(struct vop_reclaim_args *);
+void	ext2_setblock(struct ext2_sb_info *, u_char *, daddr_t);
+int	ext2_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *);
+int	ext2_update(struct vnode *, int);
+int	ext2_valloc(struct vnode *, int, struct ucred *, struct vnode **);
+int	ext2_vfree(struct vnode *, ino_t, int);
+int 	ext2_lookup(struct vop_cachedlookup_args *);
+int 	ext2_readdir(struct vop_readdir_args *);
+void	ext2_print_dinode(struct dinode *);
+void	ext2_print_inode(struct inode *);
+int	ext2_direnter(struct inode *, 
+		struct vnode *, struct componentname *);
+int	ext2_dirremove(struct vnode *, struct componentname *);
+int	ext2_dirrewrite(struct inode *,
+		struct inode *, struct componentname *);
+int	ext2_dirempty(struct inode *, ino_t, struct ucred *);
+int	ext2_checkpath(struct inode *, struct inode *, struct ucred *);
+struct  ext2_group_desc * get_group_desc(struct mount * , 
+		unsigned int , struct buf ** );
+int	ext2_group_sparse(int group);
+void	ext2_discard_prealloc(struct inode *);
+int	ext2_inactive(struct vop_inactive_args *);
+int	ext2_new_block(struct mount * mp, unsigned long goal,
 			    u_int32_t * prealloc_count,
-			    u_int32_t * prealloc_block));
-ino_t	ext2_new_inode __P ((const struct inode * dir, int mode));
-unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
-void	ext2_free_blocks __P((struct mount * mp, unsigned long block,
-			      unsigned long count));
-void	ext2_free_inode __P((struct inode * inode));
-void	ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
-void	ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
-void	mark_buffer_dirty __P((struct buf *bh));
+			    u_int32_t * prealloc_block);
+ino_t	ext2_new_inode(const struct inode * dir, int mode);
+unsigned long ext2_count_free(struct buf *map, unsigned int numchars);
+void	ext2_free_blocks(struct mount * mp, unsigned long block,
+			      unsigned long count);
+void	ext2_free_inode(struct inode * inode);
+void	ext2_ei2di(struct ext2_inode *ei, struct dinode *di);
+void	ext2_di2ei(struct dinode *di, struct ext2_inode *ei);
+void	mark_buffer_dirty(struct buf *bh);
 
 /*
  * This macro allows the ufs code to distinguish between an EXT2 and a
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index 6a3e011..a6ce2ff 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -65,8 +65,8 @@
 #include <gnu/ext2fs/fs.h>
 #include <gnu/ext2fs/ext2_extern.h>
 
-static int ext2_indirtrunc __P((struct inode *, daddr_t, daddr_t, daddr_t, int,
-	    long *));
+static int ext2_indirtrunc(struct inode *, daddr_t, daddr_t, daddr_t, int,
+	    long *);
 
 int
 ext2_init(struct vfsconf *vfsp)
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index 50479e0..57ded62 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -111,9 +111,9 @@ static u_char dt_to_ext2_ft[] = {
     ((dt) > sizeof(dt_to_ext2_ft) / sizeof(dt_to_ext2_ft[0]) ?	\
     EXT2_FT_UNKNOWN : dt_to_ext2_ft[(dt)])
 
-static int	ext2_dirbadentry __P((struct vnode *dp,
+static int	ext2_dirbadentry(struct vnode *dp,
 				      struct ext2_dir_entry_2 *de,
-				      int entryoffsetinblock));
+				      int entryoffsetinblock);
 
 /*
  * Vnode op for reading directories.
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 85c9866..12010a3 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -86,12 +86,12 @@ struct ufsmount {
 	int64_t	um_savedmaxfilesize;		/* XXX - limit maxfilesize */
 	struct malloc_type *um_malloctype;	/* The inodes malloctype */
 	int	um_i_effnlink_valid;		/* i_effnlink valid? */
-	int	(*um_balloc) __P((struct vnode *, off_t, int, struct ucred *, int, struct buf **));
-	int	(*um_blkatoff) __P((struct vnode *, off_t, char **, struct buf **));
-	int	(*um_truncate) __P((struct vnode *, off_t, int, struct ucred *, struct thread *));
-	int	(*um_update) __P((struct vnode *, int));
-	int	(*um_valloc) __P((struct vnode *, int, struct ucred *, struct vnode **));
-	int	(*um_vfree) __P((struct vnode *, ino_t, int));
+	int	(*um_balloc)(struct vnode *, off_t, int, struct ucred *, int, struct buf **);
+	int	(*um_blkatoff)(struct vnode *, off_t, char **, struct buf **);
+	int	(*um_truncate)(struct vnode *, off_t, int, struct ucred *, struct thread *);
+	int	(*um_update)(struct vnode *, int);
+	int	(*um_valloc)(struct vnode *, int, struct ucred *, struct vnode **);
+	int	(*um_vfree)(struct vnode *, ino_t, int);
 };
 
 #define UFS_BALLOC(aa, bb, cc, dd, ee, ff) VFSTOUFS((aa)->v_mount)->um_balloc(aa, bb, cc, dd, ee, ff)
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index fc8b623..5401efe 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -60,7 +60,7 @@
 #include "opt_ddb.h"
 
 #ifdef DDB
-void	ext2_checkoverlap __P((struct buf *, struct inode *));
+void	ext2_checkoverlap(struct buf *, struct inode *);
 #endif
 
 /*
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 8a7cc07..4571bb7 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -69,19 +69,19 @@
 #include <gnu/ext2fs/ext2_fs.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 
-static int ext2_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-static int ext2_flushfiles __P((struct mount *mp, int flags, struct thread *td));
-static int ext2_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct thread *));
-static int ext2_mountfs __P((struct vnode *, struct mount *, struct thread *));
-static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
-			struct thread *td));
-static int ext2_sbupdate __P((struct ufsmount *, int));
-static int ext2_statfs __P((struct mount *, struct statfs *, struct thread *));
-static int ext2_sync __P((struct mount *, int, struct ucred *, struct thread *));
-static int ext2_unmount __P((struct mount *, int, struct thread *));
-static int ext2_vget __P((struct mount *, ino_t, int, struct vnode **));
-static int ext2_vptofh __P((struct vnode *, struct fid *));
+static int ext2_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
+static int ext2_mount(struct mount *,
+	    char *, caddr_t, struct nameidata *, struct thread *);
+static int ext2_mountfs(struct vnode *, struct mount *, struct thread *);
+static int ext2_reload(struct mount *mountp, struct ucred *cred,
+			struct thread *td);
+static int ext2_sbupdate(struct ufsmount *, int);
+static int ext2_statfs(struct mount *, struct statfs *, struct thread *);
+static int ext2_sync(struct mount *, int, struct ucred *, struct thread *);
+static int ext2_unmount(struct mount *, int, struct thread *);
+static int ext2_vget(struct mount *, ino_t, int, struct vnode **);
+static int ext2_vptofh(struct vnode *, struct fid *);
 
 static MALLOC_DEFINE(M_EXT2NODE, "EXT2 node", "EXT2 vnode private part");
 
@@ -108,14 +108,14 @@ VFS_SET(ext2fs_vfsops, ext2fs, 0);
 
 static int ext2fs_inode_hash_lock;
 
-static int	ext2_check_sb_compat __P((struct ext2_super_block *es,
-					  dev_t dev, int ronly));
-static int	compute_sb_data __P((struct vnode * devvp,
+static int	ext2_check_sb_compat(struct ext2_super_block *es,
+					  dev_t dev, int ronly);
+static int	compute_sb_data(struct vnode * devvp,
 				     struct ext2_super_block * es,
-				     struct ext2_sb_info * fs));
+				     struct ext2_sb_info * fs);
 
 #ifdef notyet
-static int ext2_mountroot __P((void));
+static int ext2_mountroot(void);
 
 /*
  * Called by main() when ext2fs is going to be mounted as root.
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index a90c20f..dea762f 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -79,19 +79,19 @@
 #include <gnu/ext2fs/ext2_extern.h>
 #include <gnu/ext2fs/ext2_fs.h>
 
-static int ext2_makeinode __P((int mode, struct vnode *, struct vnode **, struct componentname *));
+static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *);
 
-static int ext2_fsync __P((struct vop_fsync_args *));
-static int ext2_read __P((struct vop_read_args *));
-static int ext2_write __P((struct vop_write_args *));
-static int ext2_remove __P((struct vop_remove_args *));
-static int ext2_link __P((struct vop_link_args *));
-static int ext2_rename __P((struct vop_rename_args *));
-static int ext2_mkdir __P((struct vop_mkdir_args *));
-static int ext2_rmdir __P((struct vop_rmdir_args *));
-static int ext2_create __P((struct vop_create_args *));
-static int ext2_mknod __P((struct vop_mknod_args *));
-static int ext2_symlink __P((struct vop_symlink_args *));
+static int ext2_fsync(struct vop_fsync_args *);
+static int ext2_read(struct vop_read_args *);
+static int ext2_write(struct vop_write_args *);
+static int ext2_remove(struct vop_remove_args *);
+static int ext2_link(struct vop_link_args *);
+static int ext2_rename(struct vop_rename_args *);
+static int ext2_mkdir(struct vop_mkdir_args *);
+static int ext2_rmdir(struct vop_rmdir_args *);
+static int ext2_create(struct vop_create_args *);
+static int ext2_mknod(struct vop_mknod_args *);
+static int ext2_symlink(struct vop_symlink_args *);
 
 /* Global vfs data structures for ufs. */
 vop_t **ext2_vnodeop_p;
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index f078e04..efba13e 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -60,7 +60,7 @@
 #include <gnu/ext2fs/fs.h>
 #include <gnu/ext2fs/ext2_extern.h>
 
-static void	ext2_fserr __P((struct ext2_sb_info *, u_int, char *));
+static void	ext2_fserr(struct ext2_sb_info *, u_int, char *);
 
 /*
  * Linux calls this functions at the following locations:
diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h
index 580683b..65fbad4 100644
--- a/sys/gnu/fs/ext2fs/ext2_extern.h
+++ b/sys/gnu/fs/ext2fs/ext2_extern.h
@@ -50,49 +50,49 @@ struct mount;
 struct vfsconf;
 struct vnode;
 
-int	ext2_alloc __P((struct inode *,
-	    daddr_t, daddr_t, int, struct ucred *, daddr_t *));
-int	ext2_balloc __P((struct inode *,
-	    daddr_t, int, struct ucred *, struct buf **, int));
-int	ext2_blkatoff __P((struct vnode *, off_t, char **, struct buf **));
-void	ext2_blkfree __P((struct inode *, daddr_t, long));
-daddr_t	ext2_blkpref __P((struct inode *, daddr_t, int, daddr_t *, daddr_t));
-int	ext2_bmap __P((struct vop_bmap_args *));
-int	ext2_init __P((struct vfsconf *));
-int	ext2_reallocblks __P((struct vop_reallocblks_args *));
-int	ext2_reclaim __P((struct vop_reclaim_args *));
-void	ext2_setblock __P((struct ext2_sb_info *, u_char *, daddr_t));
-int	ext2_truncate __P((struct vnode *, off_t, int, struct ucred *, struct thread *));
-int	ext2_update __P((struct vnode *, int));
-int	ext2_valloc __P((struct vnode *, int, struct ucred *, struct vnode **));
-int	ext2_vfree __P((struct vnode *, ino_t, int));
-int 	ext2_lookup __P((struct vop_cachedlookup_args *));
-int 	ext2_readdir __P((struct vop_readdir_args *));
-void	ext2_print_dinode __P((struct dinode *));
-void	ext2_print_inode __P((struct inode *));
-int	ext2_direnter __P((struct inode *, 
-		struct vnode *, struct componentname *));
-int	ext2_dirremove __P((struct vnode *, struct componentname *));
-int	ext2_dirrewrite __P((struct inode *,
-		struct inode *, struct componentname *));
-int	ext2_dirempty __P((struct inode *, ino_t, struct ucred *));
-int	ext2_checkpath __P((struct inode *, struct inode *, struct ucred *));
-struct  ext2_group_desc * get_group_desc __P((struct mount * , 
-		unsigned int , struct buf ** ));
-int	ext2_group_sparse __P((int group));
-void	ext2_discard_prealloc __P((struct inode *));
-int	ext2_inactive __P((struct vop_inactive_args *));
-int	ext2_new_block __P ((struct mount * mp, unsigned long goal,
+int	ext2_alloc(struct inode *,
+	    daddr_t, daddr_t, int, struct ucred *, daddr_t *);
+int	ext2_balloc(struct inode *,
+	    daddr_t, int, struct ucred *, struct buf **, int);
+int	ext2_blkatoff(struct vnode *, off_t, char **, struct buf **);
+void	ext2_blkfree(struct inode *, daddr_t, long);
+daddr_t	ext2_blkpref(struct inode *, daddr_t, int, daddr_t *, daddr_t);
+int	ext2_bmap(struct vop_bmap_args *);
+int	ext2_init(struct vfsconf *);
+int	ext2_reallocblks(struct vop_reallocblks_args *);
+int	ext2_reclaim(struct vop_reclaim_args *);
+void	ext2_setblock(struct ext2_sb_info *, u_char *, daddr_t);
+int	ext2_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *);
+int	ext2_update(struct vnode *, int);
+int	ext2_valloc(struct vnode *, int, struct ucred *, struct vnode **);
+int	ext2_vfree(struct vnode *, ino_t, int);
+int 	ext2_lookup(struct vop_cachedlookup_args *);
+int 	ext2_readdir(struct vop_readdir_args *);
+void	ext2_print_dinode(struct dinode *);
+void	ext2_print_inode(struct inode *);
+int	ext2_direnter(struct inode *, 
+		struct vnode *, struct componentname *);
+int	ext2_dirremove(struct vnode *, struct componentname *);
+int	ext2_dirrewrite(struct inode *,
+		struct inode *, struct componentname *);
+int	ext2_dirempty(struct inode *, ino_t, struct ucred *);
+int	ext2_checkpath(struct inode *, struct inode *, struct ucred *);
+struct  ext2_group_desc * get_group_desc(struct mount * , 
+		unsigned int , struct buf ** );
+int	ext2_group_sparse(int group);
+void	ext2_discard_prealloc(struct inode *);
+int	ext2_inactive(struct vop_inactive_args *);
+int	ext2_new_block(struct mount * mp, unsigned long goal,
 			    u_int32_t * prealloc_count,
-			    u_int32_t * prealloc_block));
-ino_t	ext2_new_inode __P ((const struct inode * dir, int mode));
-unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
-void	ext2_free_blocks __P((struct mount * mp, unsigned long block,
-			      unsigned long count));
-void	ext2_free_inode __P((struct inode * inode));
-void	ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
-void	ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
-void	mark_buffer_dirty __P((struct buf *bh));
+			    u_int32_t * prealloc_block);
+ino_t	ext2_new_inode(const struct inode * dir, int mode);
+unsigned long ext2_count_free(struct buf *map, unsigned int numchars);
+void	ext2_free_blocks(struct mount * mp, unsigned long block,
+			      unsigned long count);
+void	ext2_free_inode(struct inode * inode);
+void	ext2_ei2di(struct ext2_inode *ei, struct dinode *di);
+void	ext2_di2ei(struct dinode *di, struct ext2_inode *ei);
+void	mark_buffer_dirty(struct buf *bh);
 
 /*
  * This macro allows the ufs code to distinguish between an EXT2 and a
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 6a3e011..a6ce2ff 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -65,8 +65,8 @@
 #include <gnu/ext2fs/fs.h>
 #include <gnu/ext2fs/ext2_extern.h>
 
-static int ext2_indirtrunc __P((struct inode *, daddr_t, daddr_t, daddr_t, int,
-	    long *));
+static int ext2_indirtrunc(struct inode *, daddr_t, daddr_t, daddr_t, int,
+	    long *);
 
 int
 ext2_init(struct vfsconf *vfsp)
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index 50479e0..57ded62 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -111,9 +111,9 @@ static u_char dt_to_ext2_ft[] = {
     ((dt) > sizeof(dt_to_ext2_ft) / sizeof(dt_to_ext2_ft[0]) ?	\
     EXT2_FT_UNKNOWN : dt_to_ext2_ft[(dt)])
 
-static int	ext2_dirbadentry __P((struct vnode *dp,
+static int	ext2_dirbadentry(struct vnode *dp,
 				      struct ext2_dir_entry_2 *de,
-				      int entryoffsetinblock));
+				      int entryoffsetinblock);
 
 /*
  * Vnode op for reading directories.
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 85c9866..12010a3 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -86,12 +86,12 @@ struct ufsmount {
 	int64_t	um_savedmaxfilesize;		/* XXX - limit maxfilesize */
 	struct malloc_type *um_malloctype;	/* The inodes malloctype */
 	int	um_i_effnlink_valid;		/* i_effnlink valid? */
-	int	(*um_balloc) __P((struct vnode *, off_t, int, struct ucred *, int, struct buf **));
-	int	(*um_blkatoff) __P((struct vnode *, off_t, char **, struct buf **));
-	int	(*um_truncate) __P((struct vnode *, off_t, int, struct ucred *, struct thread *));
-	int	(*um_update) __P((struct vnode *, int));
-	int	(*um_valloc) __P((struct vnode *, int, struct ucred *, struct vnode **));
-	int	(*um_vfree) __P((struct vnode *, ino_t, int));
+	int	(*um_balloc)(struct vnode *, off_t, int, struct ucred *, int, struct buf **);
+	int	(*um_blkatoff)(struct vnode *, off_t, char **, struct buf **);
+	int	(*um_truncate)(struct vnode *, off_t, int, struct ucred *, struct thread *);
+	int	(*um_update)(struct vnode *, int);
+	int	(*um_valloc)(struct vnode *, int, struct ucred *, struct vnode **);
+	int	(*um_vfree)(struct vnode *, ino_t, int);
 };
 
 #define UFS_BALLOC(aa, bb, cc, dd, ee, ff) VFSTOUFS((aa)->v_mount)->um_balloc(aa, bb, cc, dd, ee, ff)
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index fc8b623..5401efe 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -60,7 +60,7 @@
 #include "opt_ddb.h"
 
 #ifdef DDB
-void	ext2_checkoverlap __P((struct buf *, struct inode *));
+void	ext2_checkoverlap(struct buf *, struct inode *);
 #endif
 
 /*
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 8a7cc07..4571bb7 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -69,19 +69,19 @@
 #include <gnu/ext2fs/ext2_fs.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 
-static int ext2_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-static int ext2_flushfiles __P((struct mount *mp, int flags, struct thread *td));
-static int ext2_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct thread *));
-static int ext2_mountfs __P((struct vnode *, struct mount *, struct thread *));
-static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
-			struct thread *td));
-static int ext2_sbupdate __P((struct ufsmount *, int));
-static int ext2_statfs __P((struct mount *, struct statfs *, struct thread *));
-static int ext2_sync __P((struct mount *, int, struct ucred *, struct thread *));
-static int ext2_unmount __P((struct mount *, int, struct thread *));
-static int ext2_vget __P((struct mount *, ino_t, int, struct vnode **));
-static int ext2_vptofh __P((struct vnode *, struct fid *));
+static int ext2_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
+static int ext2_mount(struct mount *,
+	    char *, caddr_t, struct nameidata *, struct thread *);
+static int ext2_mountfs(struct vnode *, struct mount *, struct thread *);
+static int ext2_reload(struct mount *mountp, struct ucred *cred,
+			struct thread *td);
+static int ext2_sbupdate(struct ufsmount *, int);
+static int ext2_statfs(struct mount *, struct statfs *, struct thread *);
+static int ext2_sync(struct mount *, int, struct ucred *, struct thread *);
+static int ext2_unmount(struct mount *, int, struct thread *);
+static int ext2_vget(struct mount *, ino_t, int, struct vnode **);
+static int ext2_vptofh(struct vnode *, struct fid *);
 
 static MALLOC_DEFINE(M_EXT2NODE, "EXT2 node", "EXT2 vnode private part");
 
@@ -108,14 +108,14 @@ VFS_SET(ext2fs_vfsops, ext2fs, 0);
 
 static int ext2fs_inode_hash_lock;
 
-static int	ext2_check_sb_compat __P((struct ext2_super_block *es,
-					  dev_t dev, int ronly));
-static int	compute_sb_data __P((struct vnode * devvp,
+static int	ext2_check_sb_compat(struct ext2_super_block *es,
+					  dev_t dev, int ronly);
+static int	compute_sb_data(struct vnode * devvp,
 				     struct ext2_super_block * es,
-				     struct ext2_sb_info * fs));
+				     struct ext2_sb_info * fs);
 
 #ifdef notyet
-static int ext2_mountroot __P((void));
+static int ext2_mountroot(void);
 
 /*
  * Called by main() when ext2fs is going to be mounted as root.
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index a90c20f..dea762f 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -79,19 +79,19 @@
 #include <gnu/ext2fs/ext2_extern.h>
 #include <gnu/ext2fs/ext2_fs.h>
 
-static int ext2_makeinode __P((int mode, struct vnode *, struct vnode **, struct componentname *));
+static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *);
 
-static int ext2_fsync __P((struct vop_fsync_args *));
-static int ext2_read __P((struct vop_read_args *));
-static int ext2_write __P((struct vop_write_args *));
-static int ext2_remove __P((struct vop_remove_args *));
-static int ext2_link __P((struct vop_link_args *));
-static int ext2_rename __P((struct vop_rename_args *));
-static int ext2_mkdir __P((struct vop_mkdir_args *));
-static int ext2_rmdir __P((struct vop_rmdir_args *));
-static int ext2_create __P((struct vop_create_args *));
-static int ext2_mknod __P((struct vop_mknod_args *));
-static int ext2_symlink __P((struct vop_symlink_args *));
+static int ext2_fsync(struct vop_fsync_args *);
+static int ext2_read(struct vop_read_args *);
+static int ext2_write(struct vop_write_args *);
+static int ext2_remove(struct vop_remove_args *);
+static int ext2_link(struct vop_link_args *);
+static int ext2_rename(struct vop_rename_args *);
+static int ext2_mkdir(struct vop_mkdir_args *);
+static int ext2_rmdir(struct vop_rmdir_args *);
+static int ext2_create(struct vop_create_args *);
+static int ext2_mknod(struct vop_mknod_args *);
+static int ext2_symlink(struct vop_symlink_args *);
 
 /* Global vfs data structures for ufs. */
 vop_t **ext2_vnodeop_p;