diff options
author | alfred <alfred@FreeBSD.org> | 2002-03-19 22:40:48 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-03-19 22:40:48 +0000 |
commit | 79061a930630646bcfae6d7f81cedda50705cfbb (patch) | |
tree | d808f6096e1d40f5089a77d9cf1abc15ee82a9fe | |
parent | 1446d094292532062a83b8dc4587f9b62a6120df (diff) | |
download | FreeBSD-src-79061a930630646bcfae6d7f81cedda50705cfbb.zip FreeBSD-src-79061a930630646bcfae6d7f81cedda50705cfbb.tar.gz |
Remove __P.
30 files changed, 439 insertions, 448 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; diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 374c0b9..0dd7269 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -58,25 +58,23 @@ #include <ufs/ffs/fs.h> #include <ufs/ffs/ffs_extern.h> -typedef ufs_daddr_t allocfcn_t __P((struct inode *ip, int cg, ufs_daddr_t bpref, - int size)); +typedef ufs_daddr_t allocfcn_t(struct inode *ip, int cg, ufs_daddr_t bpref, + int size); -static ufs_daddr_t ffs_alloccg __P((struct inode *, int, ufs_daddr_t, int)); +static ufs_daddr_t ffs_alloccg(struct inode *, int, ufs_daddr_t, int); static ufs_daddr_t - ffs_alloccgblk __P((struct inode *, struct buf *, ufs_daddr_t)); + ffs_alloccgblk(struct inode *, struct buf *, ufs_daddr_t); #ifdef DIAGNOSTIC -static int ffs_checkblk __P((struct inode *, ufs_daddr_t, long)); +static int ffs_checkblk(struct inode *, ufs_daddr_t, long); #endif -static ufs_daddr_t ffs_clusteralloc __P((struct inode *, int, ufs_daddr_t, - int)); -static ino_t ffs_dirpref __P((struct inode *)); -static ufs_daddr_t ffs_fragextend __P((struct inode *, int, long, int, int)); -static void ffs_fserr __P((struct fs *, ino_t, char *)); +static ufs_daddr_t ffs_clusteralloc(struct inode *, int, ufs_daddr_t, int); +static ino_t ffs_dirpref(struct inode *); +static ufs_daddr_t ffs_fragextend(struct inode *, int, long, int, int); +static void ffs_fserr(struct fs *, ino_t, char *); static u_long ffs_hashalloc - __P((struct inode *, int, long, int, allocfcn_t *)); -static ino_t ffs_nodealloccg __P((struct inode *, int, ufs_daddr_t, int)); -static ufs_daddr_t ffs_mapsearch __P((struct fs *, struct cg *, ufs_daddr_t, - int)); + (struct inode *, int, long, int, allocfcn_t *); +static ino_t ffs_nodealloccg(struct inode *, int, ufs_daddr_t, int); +static ufs_daddr_t ffs_mapsearch(struct fs *, struct cg *, ufs_daddr_t, int); /* * Allocate a block in the file system. @@ -1893,7 +1891,7 @@ ffs_fserr(fs, inum, cp) * flags set (second parameter +1) or cleared (second parameter -1). */ -static int sysctl_ffs_fsck __P((SYSCTL_HANDLER_ARGS)); +static int sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS); SYSCTL_PROC(_vfs_ffs, FFS_ADJ_REFCNT, adjrefcnt, CTLFLAG_WR|CTLTYPE_STRUCT, 0, 0, sysctl_ffs_fsck, "S,fsck", "Adjust Inode Reference Count"); diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 1da7153..bbb12ab 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -54,47 +54,45 @@ struct vop_fsync_args; struct vop_reallocblks_args; struct vop_copyonwrite_args; -int ffs_alloc __P((struct inode *, - ufs_daddr_t, ufs_daddr_t, int, struct ucred *, ufs_daddr_t *)); -int ffs_balloc __P((struct vnode *a_vp, off_t a_startoffset, int a_size, - struct ucred *a_cred, int a_flags, struct buf **a_bpp)); -int ffs_blkatoff __P((struct vnode *, off_t, char **, struct buf **)); -void ffs_blkfree __P((struct fs *, struct vnode *, ufs_daddr_t, long, - ino_t)); -ufs_daddr_t ffs_blkpref __P((struct inode *, ufs_daddr_t, int, ufs_daddr_t *)); -void ffs_clrblock __P((struct fs *, u_char *, ufs_daddr_t)); -void ffs_clusteracct __P((struct fs *, struct cg *, ufs_daddr_t, int)); -int ffs_fhtovp __P((struct mount *, struct fid *, struct vnode **)); -int ffs_flushfiles __P((struct mount *, int, struct thread *)); -void ffs_fragacct __P((struct fs *, int, int32_t [], int)); -int ffs_freefile __P((struct fs *, struct vnode *, ino_t, int )); -int ffs_isblock __P((struct fs *, u_char *, ufs_daddr_t)); -int ffs_isfreeblock __P((struct fs *, unsigned char *, ufs_daddr_t)); -int ffs_mountfs __P((struct vnode *, struct mount *, struct thread *, - struct malloc_type *)); -int ffs_mountroot __P((void)); -int ffs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, - struct thread *)); -int ffs_reallocblks __P((struct vop_reallocblks_args *)); -int ffs_realloccg __P((struct inode *, - ufs_daddr_t, ufs_daddr_t, int, int, struct ucred *, struct buf **)); -void ffs_setblock __P((struct fs *, u_char *, ufs_daddr_t)); -int ffs_snapblkfree __P((struct fs *, struct vnode *, ufs_daddr_t, - long, ino_t)); -void ffs_snapremove __P((struct vnode *vp)); -int ffs_snapshot __P((struct mount *mp, char *snapfile)); -void ffs_snapshot_mount __P((struct mount *mp)); -void ffs_snapshot_unmount __P((struct mount *mp)); -int ffs_statfs __P((struct mount *, struct statfs *, struct thread *)); -int ffs_sync __P((struct mount *, int, struct ucred *, struct thread *)); -int ffs_truncate __P((struct vnode *, off_t, int, struct ucred *, struct thread *)); -int ffs_unmount __P((struct mount *, int, struct thread *)); -int ffs_update __P((struct vnode *, int)); -int ffs_valloc __P((struct vnode *, int, struct ucred *, struct vnode **)); +int ffs_alloc(struct inode *, + ufs_daddr_t, ufs_daddr_t, int, struct ucred *, ufs_daddr_t *); +int ffs_balloc(struct vnode *a_vp, off_t a_startoffset, int a_size, + struct ucred *a_cred, int a_flags, struct buf **a_bpp); +int ffs_blkatoff(struct vnode *, off_t, char **, struct buf **); +void ffs_blkfree(struct fs *, struct vnode *, ufs_daddr_t, long, ino_t); +ufs_daddr_t ffs_blkpref(struct inode *, ufs_daddr_t, int, ufs_daddr_t *); +void ffs_clrblock(struct fs *, u_char *, ufs_daddr_t); +void ffs_clusteracct (struct fs *, struct cg *, ufs_daddr_t, int); +int ffs_fhtovp(struct mount *, struct fid *, struct vnode **); +int ffs_flushfiles(struct mount *, int, struct thread *); +void ffs_fragacct(struct fs *, int, int32_t [], int); +int ffs_freefile(struct fs *, struct vnode *, ino_t, int ); +int ffs_isblock(struct fs *, u_char *, ufs_daddr_t); +int ffs_isfreeblock(struct fs *, unsigned char *, ufs_daddr_t); +int ffs_mountfs(struct vnode *, struct mount *, struct thread *, + struct malloc_type *); +int ffs_mountroot(void); +int ffs_mount(struct mount *, char *, caddr_t, struct nameidata *, + struct thread *); +int ffs_reallocblks(struct vop_reallocblks_args *); +int ffs_realloccg(struct inode *, + ufs_daddr_t, ufs_daddr_t, int, int, struct ucred *, struct buf **); +void ffs_setblock(struct fs *, u_char *, ufs_daddr_t); +int ffs_snapblkfree(struct fs *, struct vnode *, ufs_daddr_t, long, ino_t); +void ffs_snapremove(struct vnode *vp); +int ffs_snapshot(struct mount *mp, char *snapfile); +void ffs_snapshot_mount(struct mount *mp); +void ffs_snapshot_unmount(struct mount *mp); +int ffs_statfs(struct mount *, struct statfs *, struct thread *); +int ffs_sync(struct mount *, int, struct ucred *, struct thread *); +int ffs_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *); +int ffs_unmount(struct mount *, int, struct thread *); +int ffs_update(struct vnode *, int); +int ffs_valloc(struct vnode *, int, struct ucred *, struct vnode **); -int ffs_vfree __P((struct vnode *, ino_t, int)); -int ffs_vget __P((struct mount *, ino_t, int, struct vnode **)); -int ffs_vptofh __P((struct vnode *, struct fid *)); +int ffs_vfree(struct vnode *, ino_t, int); +int ffs_vget(struct mount *, ino_t, int, struct vnode **); +int ffs_vptofh(struct vnode *, struct fid *); extern vop_t **ffs_vnodeop_p; extern vop_t **ffs_specop_p; @@ -103,29 +101,29 @@ extern vop_t **ffs_fifoop_p; /* * Soft update function prototypes. */ -void softdep_initialize __P((void)); -int softdep_mount __P((struct vnode *, struct mount *, struct fs *, - struct ucred *)); -int softdep_flushworklist __P((struct mount *, int *, struct thread *)); -int softdep_flushfiles __P((struct mount *, int, struct thread *)); -void softdep_update_inodeblock __P((struct inode *, struct buf *, int)); -void softdep_load_inodeblock __P((struct inode *)); -void softdep_freefile __P((struct vnode *, ino_t, int)); -int softdep_request_cleanup __P((struct fs *, struct vnode *)); -void softdep_setup_freeblocks __P((struct inode *, off_t)); -void softdep_setup_inomapdep __P((struct buf *, struct inode *, ino_t)); -void softdep_setup_blkmapdep __P((struct buf *, struct fs *, ufs_daddr_t)); -void softdep_setup_allocdirect __P((struct inode *, ufs_lbn_t, ufs_daddr_t, - ufs_daddr_t, long, long, struct buf *)); -void softdep_setup_allocindir_meta __P((struct buf *, struct inode *, - struct buf *, int, ufs_daddr_t)); -void softdep_setup_allocindir_page __P((struct inode *, ufs_lbn_t, - struct buf *, int, ufs_daddr_t, ufs_daddr_t, struct buf *)); -void softdep_fsync_mountdev __P((struct vnode *)); -int softdep_sync_metadata __P((struct vop_fsync_args *)); +void softdep_initialize(void); +int softdep_mount(struct vnode *, struct mount *, struct fs *, + struct ucred *); +int softdep_flushworklist(struct mount *, int *, struct thread *); +int softdep_flushfiles(struct mount *, int, struct thread *); +void softdep_update_inodeblock(struct inode *, struct buf *, int); +void softdep_load_inodeblock(struct inode *); +void softdep_freefile(struct vnode *, ino_t, int); +int softdep_request_cleanup(struct fs *, struct vnode *); +void softdep_setup_freeblocks(struct inode *, off_t); +void softdep_setup_inomapdep(struct buf *, struct inode *, ino_t); +void softdep_setup_blkmapdep(struct buf *, struct fs *, ufs_daddr_t); +void softdep_setup_allocdirect(struct inode *, ufs_lbn_t, ufs_daddr_t, + ufs_daddr_t, long, long, struct buf *); +void softdep_setup_allocindir_meta(struct buf *, struct inode *, + struct buf *, int, ufs_daddr_t); +void softdep_setup_allocindir_page(struct inode *, ufs_lbn_t, + struct buf *, int, ufs_daddr_t, ufs_daddr_t, struct buf *); +void softdep_fsync_mountdev(struct vnode *); +int softdep_sync_metadata(struct vop_fsync_args *); /* XXX incorrectly moved to mount.h - should be indirect function */ #if 0 -int softdep_fsync __P((struct vnode *vp)); +int softdep_fsync(struct vnode *vp); #endif #endif /* !_UFS_FFS_EXTERN_H */ diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 301cb49..75d30d9 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -60,8 +60,8 @@ #include <ufs/ffs/fs.h> #include <ufs/ffs/ffs_extern.h> -static int ffs_indirtrunc __P((struct inode *, ufs_daddr_t, ufs_daddr_t, - ufs_daddr_t, int, long *)); +static int ffs_indirtrunc(struct inode *, ufs_daddr_t, ufs_daddr_t, + ufs_daddr_t, int, long *); /* * Update the access, modified, and inode change times as specified by the diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index e661d73..257450b 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -60,21 +60,21 @@ #define KERNCRED thread0.td_ucred #define DEBUG 1 -static int cgaccount __P((int, struct vnode *, struct buf *, int)); -static int expunge __P((struct vnode *, struct inode *, struct fs *, - int (*) __P((struct vnode *, ufs_daddr_t *, ufs_daddr_t *, struct fs *, - ufs_daddr_t, int)), int)); -static int indiracct __P((struct vnode *, struct vnode *, int, ufs_daddr_t, - int, int, int, int, struct fs *, int (*) __P((struct vnode *, - ufs_daddr_t *, ufs_daddr_t *, struct fs *, ufs_daddr_t, int)), int)); -static int fullacct __P((struct vnode *, ufs_daddr_t *, ufs_daddr_t *, - struct fs *, ufs_daddr_t, int)); -static int snapacct __P((struct vnode *, ufs_daddr_t *, ufs_daddr_t *, - struct fs *, ufs_daddr_t, int)); -static int mapacct __P((struct vnode *, ufs_daddr_t *, ufs_daddr_t *, - struct fs *, ufs_daddr_t, int)); -static int ffs_copyonwrite __P((struct vnode *, struct buf *)); -static int readblock __P((struct buf *, daddr_t)); +static int cgaccount(int, struct vnode *, struct buf *, int); +static int expunge(struct vnode *, struct inode *, struct fs *, + int (*)(struct vnode *, ufs_daddr_t *, ufs_daddr_t *, struct fs *, + ufs_daddr_t, int), int); +static int indiracct(struct vnode *, struct vnode *, int, ufs_daddr_t, + int, int, int, int, struct fs *, int (*)(struct vnode *, + ufs_daddr_t *, ufs_daddr_t *, struct fs *, ufs_daddr_t, int), int); +static int fullacct(struct vnode *, ufs_daddr_t *, ufs_daddr_t *, + struct fs *, ufs_daddr_t, int); +static int snapacct(struct vnode *, ufs_daddr_t *, ufs_daddr_t *, + struct fs *, ufs_daddr_t, int); +static int mapacct(struct vnode *, ufs_daddr_t *, ufs_daddr_t *, + struct fs *, ufs_daddr_t, int); +static int ffs_copyonwrite(struct vnode *, struct buf *); +static int readblock(struct buf *, daddr_t); /* * To ensure the consistency of snapshots across crashes, we must @@ -614,8 +614,8 @@ expunge(snapvp, cancelip, fs, acctfunc, expungetype) struct vnode *snapvp; struct inode *cancelip; struct fs *fs; - int (*acctfunc) __P((struct vnode *, ufs_daddr_t *, ufs_daddr_t *, - struct fs *, ufs_daddr_t, int)); + int (*acctfunc)(struct vnode *, ufs_daddr_t *, ufs_daddr_t *, + struct fs *, ufs_daddr_t, int); int expungetype; { int i, len, error, numblks, blksperindir; @@ -698,8 +698,8 @@ indiracct(snapvp, cancelvp, level, blkno, lbn, rlbn, remblks, blksperindir, fs, int remblks; int blksperindir; struct fs *fs; - int (*acctfunc) __P((struct vnode *, ufs_daddr_t *, ufs_daddr_t *, - struct fs *, ufs_daddr_t, int)); + int (*acctfunc)(struct vnode *, ufs_daddr_t *, ufs_daddr_t *, + struct fs *, ufs_daddr_t, int); int expungetype; { int subblksperindir, error, last, num, i; diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 5110b8c..0e9dfc1 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -148,65 +148,62 @@ static struct malloc_type *memtype[] = { /* * Internal function prototypes. */ -static void softdep_error __P((char *, int)); -static void drain_output __P((struct vnode *, int)); -static int getdirtybuf __P((struct buf **, int)); -static void clear_remove __P((struct thread *)); -static void clear_inodedeps __P((struct thread *)); -static int flush_pagedep_deps __P((struct vnode *, struct mount *, - struct diraddhd *)); -static int flush_inodedep_deps __P((struct fs *, ino_t)); -static int handle_written_filepage __P((struct pagedep *, struct buf *)); -static void diradd_inode_written __P((struct diradd *, struct inodedep *)); -static int handle_written_inodeblock __P((struct inodedep *, struct buf *)); -static void handle_allocdirect_partdone __P((struct allocdirect *)); -static void handle_allocindir_partdone __P((struct allocindir *)); -static void initiate_write_filepage __P((struct pagedep *, struct buf *)); -static void handle_written_mkdir __P((struct mkdir *, int)); -static void initiate_write_inodeblock __P((struct inodedep *, struct buf *)); -static void handle_workitem_freefile __P((struct freefile *)); -static void handle_workitem_remove __P((struct dirrem *, struct vnode *)); -static struct dirrem *newdirrem __P((struct buf *, struct inode *, - struct inode *, int, struct dirrem **)); -static void free_diradd __P((struct diradd *)); -static void free_allocindir __P((struct allocindir *, struct inodedep *)); -static void free_newdirblk __P((struct newdirblk *)); -static int indir_trunc __P((struct freeblks *, ufs_daddr_t, int, ufs_lbn_t, - long *)); -static void deallocate_dependencies __P((struct buf *, struct inodedep *)); -static void free_allocdirect __P((struct allocdirectlst *, - struct allocdirect *, int)); -static int check_inode_unwritten __P((struct inodedep *)); -static int free_inodedep __P((struct inodedep *)); -static void handle_workitem_freeblocks __P((struct freeblks *, int)); -static void merge_inode_lists __P((struct inodedep *)); -static void setup_allocindir_phase2 __P((struct buf *, struct inode *, - struct allocindir *)); -static struct allocindir *newallocindir __P((struct inode *, int, ufs_daddr_t, - ufs_daddr_t)); -static void handle_workitem_freefrag __P((struct freefrag *)); -static struct freefrag *newfreefrag __P((struct inode *, ufs_daddr_t, long)); -static void allocdirect_merge __P((struct allocdirectlst *, - struct allocdirect *, struct allocdirect *)); -static struct bmsafemap *bmsafemap_lookup __P((struct buf *)); -static int newblk_lookup __P((struct fs *, ufs_daddr_t, int, - struct newblk **)); -static int inodedep_lookup __P((struct fs *, ino_t, int, struct inodedep **)); -static int pagedep_lookup __P((struct inode *, ufs_lbn_t, int, - struct pagedep **)); -static void pause_timer __P((void *)); -static int request_cleanup __P((int, int)); -static int process_worklist_item __P((struct mount *, int)); -static void add_to_worklist __P((struct worklist *)); +static void softdep_error(char *, int); +static void drain_output(struct vnode *, int); +static int getdirtybuf(struct buf **, int); +static void clear_remove(struct thread *); +static void clear_inodedeps(struct thread *); +static int flush_pagedep_deps(struct vnode *, struct mount *, + struct diraddhd *); +static int flush_inodedep_deps(struct fs *, ino_t); +static int handle_written_filepage(struct pagedep *, struct buf *); +static void diradd_inode_written(struct diradd *, struct inodedep *); +static int handle_written_inodeblock(struct inodedep *, struct buf *); +static void handle_allocdirect_partdone(struct allocdirect *); +static void handle_allocindir_partdone(struct allocindir *); +static void initiate_write_filepage(struct pagedep *, struct buf *); +static void handle_written_mkdir(struct mkdir *, int); +static void initiate_write_inodeblock(struct inodedep *, struct buf *); +static void handle_workitem_freefile(struct freefile *); +static void handle_workitem_remove(struct dirrem *, struct vnode *); +static struct dirrem *newdirrem(struct buf *, struct inode *, + struct inode *, int, struct dirrem **); +static void free_diradd(struct diradd *); +static void free_allocindir(struct allocindir *, struct inodedep *); +static void free_newdirblk(struct newdirblk *); +static int indir_trunc(struct freeblks *, ufs_daddr_t, int, ufs_lbn_t, long *); +static void deallocate_dependencies(struct buf *, struct inodedep *); +static void free_allocdirect(struct allocdirectlst *, + struct allocdirect *, int); +static int check_inode_unwritten(struct inodedep *); +static int free_inodedep(struct inodedep *); +static void handle_workitem_freeblocks(struct freeblks *, int); +static void merge_inode_lists(struct inodedep *); +static void setup_allocindir_phase2(struct buf *, struct inode *, + struct allocindir *); +static struct allocindir *newallocindir(struct inode *, int, ufs_daddr_t, + ufs_daddr_t); +static void handle_workitem_freefrag(struct freefrag *); +static struct freefrag *newfreefrag(struct inode *, ufs_daddr_t, long); +static void allocdirect_merge(struct allocdirectlst *, + struct allocdirect *, struct allocdirect *); +static struct bmsafemap *bmsafemap_lookup(struct buf *); +static int newblk_lookup(struct fs *, ufs_daddr_t, int, struct newblk **); +static int inodedep_lookup(struct fs *, ino_t, int, struct inodedep **); +static int pagedep_lookup(struct inode *, ufs_lbn_t, int, struct pagedep **); +static void pause_timer(void *); +static int request_cleanup(int, int); +static int process_worklist_item(struct mount *, int); +static void add_to_worklist(struct worklist *); /* * Exported softdep operations. */ -static void softdep_disk_io_initiation __P((struct buf *)); -static void softdep_disk_write_complete __P((struct buf *)); -static void softdep_deallocate_dependencies __P((struct buf *)); -static void softdep_move_dependencies __P((struct buf *, struct buf *)); -static int softdep_count_dependencies __P((struct buf *bp, int)); +static void softdep_disk_io_initiation(struct buf *); +static void softdep_disk_write_complete(struct buf *); +static void softdep_deallocate_dependencies(struct buf *); +static void softdep_move_dependencies(struct buf *, struct buf *); +static int softdep_count_dependencies(struct buf *bp, int); /* * Locking primitives. @@ -239,9 +236,9 @@ static struct lockit { } lk = { 0, NOHOLDER }; static int lockcnt; -static void acquire_lock __P((struct lockit *)); -static void free_lock __P((struct lockit *)); -void softdep_panic __P((char *)); +static void acquire_lock(struct lockit *); +static void free_lock(struct lockit *); +void softdep_panic(char *); #define ACQUIRE_LOCK(lk) acquire_lock(lk) #define FREE_LOCK(lk) free_lock(lk) @@ -290,8 +287,8 @@ softdep_panic(msg) } #endif /* DEBUG */ -static int interlocked_sleep __P((struct lockit *, int, void *, int, - const char *, int)); +static int interlocked_sleep(struct lockit *, int, void *, int, + const char *, int); /* * When going to sleep, we must save our SPL so that it does @@ -358,9 +355,9 @@ struct sema { int prio; int timo; }; -static void sema_init __P((struct sema *, char *, int, int)); -static int sema_get __P((struct sema *, struct lockit *)); -static void sema_release __P((struct sema *)); +static void sema_init(struct sema *, char *, int, int); +static int sema_get(struct sema *, struct lockit *); +static void sema_release(struct sema *); static void sema_init(semap, name, prio, timo) @@ -432,9 +429,9 @@ sema_release(semap) #define WORKITEM_FREE(item, type) FREE(item, DtoM(type)) #else /* DEBUG */ -static void worklist_insert __P((struct workhead *, struct worklist *)); -static void worklist_remove __P((struct worklist *)); -static void workitem_free __P((struct worklist *, int)); +static void worklist_insert(struct workhead *, struct worklist *); +static void worklist_remove(struct worklist *); +static void workitem_free(struct worklist *, int); #define WORKLIST_INSERT(head, item) worklist_insert(head, item) #define WORKLIST_REMOVE(item) worklist_remove(item) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index b50d1ab..a32a92a 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -54,7 +54,7 @@ #include <ufs/ffs/ffs_extern.h> #ifdef DDB -void ffs_checkoverlap __P((struct buf *, struct inode *)); +void ffs_checkoverlap(struct buf *, struct inode *); #endif /* diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 025d30a..74b40c5 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -66,10 +66,10 @@ static MALLOC_DEFINE(M_FFSNODE, "FFS node", "FFS vnode private part"); -static int ffs_sbupdate __P((struct ufsmount *, int)); -int ffs_reload __P((struct mount *,struct ucred *,struct thread *)); -static int ffs_oldfscompat __P((struct fs *)); -static int ffs_init __P((struct vfsconf *)); +static int ffs_sbupdate(struct ufsmount *, int); +int ffs_reload(struct mount *,struct ucred *,struct thread *); +static int ffs_oldfscompat(struct fs *); +static int ffs_init(struct vfsconf *); static struct vfsops ufs_vfsops = { ffs_mount, diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 8f7cd8b..8693bde 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -65,10 +65,10 @@ #include <ufs/ffs/fs.h> #include <ufs/ffs/ffs_extern.h> -int ffs_fsync __P((struct vop_fsync_args *)); -static int ffs_getpages __P((struct vop_getpages_args *)); -static int ffs_read __P((struct vop_read_args *)); -static int ffs_write __P((struct vop_write_args *)); +int ffs_fsync(struct vop_fsync_args *); +static int ffs_getpages(struct vop_getpages_args *); +static int ffs_read(struct vop_read_args *); +static int ffs_write(struct vop_write_args *); /* Global vfs data structures for ufs. */ vop_t **ffs_vnodeop_p; diff --git a/sys/ufs/ufs/acl.h b/sys/ufs/ufs/acl.h index 2420494..06bd550 100644 --- a/sys/ufs/ufs/acl.h +++ b/sys/ufs/ufs/acl.h @@ -41,9 +41,9 @@ void ufs_sync_acl_from_inode(struct inode *ip, struct acl *acl); void ufs_sync_inode_from_acl(struct acl *acl, struct inode *ip, mode_t preserve_mask); -int ufs_getacl __P((struct vop_getacl_args *)); -int ufs_setacl __P((struct vop_setacl_args *)); -int ufs_aclcheck __P((struct vop_aclcheck_args *)); +int ufs_getacl(struct vop_getacl_args *); +int ufs_setacl(struct vop_setacl_args *); +int ufs_aclcheck(struct vop_aclcheck_args *); #endif /* !_KERNEL */ diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h index 080569c..5737088 100644 --- a/sys/ufs/ufs/quota.h +++ b/sys/ufs/ufs/quota.h @@ -178,25 +178,25 @@ struct thread; struct ucred; struct vnode; -int chkdq __P((struct inode *, long, struct ucred *, int)); -int chkiq __P((struct inode *, long, struct ucred *, int)); -void dqinit __P((void)); -void dqrele __P((struct vnode *, struct dquot *)); -int getinoquota __P((struct inode *)); -int getquota __P((struct mount *, u_long, int, caddr_t)); -int qsync __P((struct mount *mp)); -int quotaoff __P((struct thread *td, struct mount *, int)); -int quotaon __P((struct thread *td, struct mount *, int, caddr_t)); -int setquota __P((struct mount *, u_long, int, caddr_t)); -int setuse __P((struct mount *, u_long, int, caddr_t)); -int ufs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct thread *td)); +int chkdq(struct inode *, long, struct ucred *, int); +int chkiq(struct inode *, long, struct ucred *, int); +void dqinit(void); +void dqrele(struct vnode *, struct dquot *); +int getinoquota(struct inode *); +int getquota(struct mount *, u_long, int, caddr_t); +int qsync(struct mount *mp); +int quotaoff(struct thread *td, struct mount *, int); +int quotaon(struct thread *td, struct mount *, int, caddr_t); +int setquota(struct mount *, u_long, int, caddr_t); +int setuse(struct mount *, u_long, int, caddr_t); +int ufs_quotactl(struct mount *, int, uid_t, caddr_t, struct thread *td); #else /* !_KERNEL */ #include <sys/cdefs.h> __BEGIN_DECLS -int quotactl __P((const char *, int, int, void *)); +int quotactl(const char *, int, int, void *); __END_DECLS #endif /* _KERNEL */ diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index dc59164..58d5b22 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -55,55 +55,53 @@ struct vop_generic_args; struct vop_inactive_args; struct vop_reclaim_args; -int ufs_vnoperate __P((struct vop_generic_args *)); -int ufs_vnoperatefifo __P((struct vop_generic_args *)); -int ufs_vnoperatespec __P((struct vop_generic_args *)); +int ufs_vnoperate(struct vop_generic_args *); +int ufs_vnoperatefifo(struct vop_generic_args *); +int ufs_vnoperatespec(struct vop_generic_args *); -int ufs_bmap __P((struct vop_bmap_args *)); -int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, - int *, int *)); +int ufs_bmap(struct vop_bmap_args *); +int ufs_bmaparray(struct vnode *, daddr_t, daddr_t *, int *, int *); int ufs_fhtovp(register struct mount *, struct ufid *, struct vnode **); -int ufs_checkpath __P((struct inode *, struct inode *, struct ucred *)); -void ufs_dirbad __P((struct inode *, doff_t, char *)); -int ufs_dirbadentry __P((struct vnode *, struct direct *, int)); -int ufs_dirempty __P((struct inode *, ino_t, struct ucred *)); -void ufs_makedirentry __P((struct inode *, struct componentname *, - struct direct *)); -int ufs_direnter __P((struct vnode *, struct vnode *, struct direct *, - struct componentname *, struct buf *)); -int ufs_dirremove __P((struct vnode *, struct inode *, int, int)); -int ufs_dirrewrite __P((struct inode *, struct inode *, ino_t, int, int)); -int ufs_getlbns __P((struct vnode *, ufs_daddr_t, struct indir *, int *)); -int ufs_ihashget __P((dev_t, ino_t, int, struct vnode **)); -void ufs_ihashinit __P((void)); -void ufs_ihashins __P((struct inode *)); +int ufs_checkpath(struct inode *, struct inode *, struct ucred *); +void ufs_dirbad(struct inode *, doff_t, char *); +int ufs_dirbadentry(struct vnode *, struct direct *, int); +int ufs_dirempty(struct inode *, ino_t, struct ucred *); +void ufs_makedirentry(struct inode *, struct componentname *, + struct direct *); +int ufs_direnter(struct vnode *, struct vnode *, struct direct *, + struct componentname *, struct buf *); +int ufs_dirremove(struct vnode *, struct inode *, int, int); +int ufs_dirrewrite(struct inode *, struct inode *, ino_t, int, int); +int ufs_getlbns(struct vnode *, ufs_daddr_t, struct indir *, int *); +int ufs_ihashget(dev_t, ino_t, int, struct vnode **); +void ufs_ihashinit(void); +void ufs_ihashins(struct inode *); struct vnode * - ufs_ihashlookup __P((dev_t, ino_t)); -void ufs_ihashrem __P((struct inode *)); -int ufs_inactive __P((struct vop_inactive_args *)); -int ufs_init __P((struct vfsconf *)); -void ufs_itimes __P((struct vnode *vp)); -int ufs_lookup __P((struct vop_cachedlookup_args *)); -int ufs_readdir __P((struct vop_readdir_args *)); -int ufs_reclaim __P((struct vop_reclaim_args *)); -void ffs_snapgone __P((struct inode *)); -int ufs_root __P((struct mount *, struct vnode **)); -int ufs_start __P((struct mount *, int, struct thread *)); -int ufs_vinit __P((struct mount *, vop_t **, vop_t **, struct vnode **)); + ufs_ihashlookup(dev_t, ino_t); +void ufs_ihashrem(struct inode *); +int ufs_inactive(struct vop_inactive_args *); +int ufs_init(struct vfsconf *); +void ufs_itimes(struct vnode *vp); +int ufs_lookup(struct vop_cachedlookup_args *); +int ufs_readdir(struct vop_readdir_args *); +int ufs_reclaim(struct vop_reclaim_args *); +void ffs_snapgone(struct inode *); +int ufs_root(struct mount *, struct vnode **); +int ufs_start(struct mount *, int, struct thread *); +int ufs_vinit(struct mount *, vop_t **, vop_t **, struct vnode **); /* * Soft update function prototypes. */ -int softdep_setup_directory_add __P((struct buf *, struct inode *, off_t, - long, struct buf *, int)); -void softdep_change_directoryentry_offset __P((struct inode *, caddr_t, - caddr_t, caddr_t, int)); -void softdep_setup_remove __P((struct buf *,struct inode *, struct inode *, - int)); -void softdep_setup_directory_change __P((struct buf *, struct inode *, - struct inode *, long, int)); -void softdep_change_linkcnt __P((struct inode *)); -void softdep_releasefile __P((struct inode *)); -int softdep_slowdown __P((struct vnode *)); +int softdep_setup_directory_add(struct buf *, struct inode *, off_t, + long, struct buf *, int); +void softdep_change_directoryentry_offset(struct inode *, caddr_t, + caddr_t, caddr_t, int); +void softdep_setup_remove(struct buf *,struct inode *, struct inode *, int); +void softdep_setup_directory_change(struct buf *, struct inode *, + struct inode *, long, int); +void softdep_change_linkcnt(struct inode *); +void softdep_releasefile(struct inode *); +int softdep_slowdown(struct vnode *); #endif /* !_UFS_UFS_EXTERN_H_ */ diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 7c31bb0..d9091c8 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -62,16 +62,16 @@ static MALLOC_DEFINE(M_DQUOT, "UFS quota", "UFS quota entries"); */ static char *quotatypes[] = INITQFNAMES; -static int chkdqchg __P((struct inode *, long, struct ucred *, int)); -static int chkiqchg __P((struct inode *, long, struct ucred *, int)); -static int dqget __P((struct vnode *, - u_long, struct ufsmount *, int, struct dquot **)); -static int dqsync __P((struct vnode *, struct dquot *)); -static void dqflush __P((struct vnode *)); +static int chkdqchg(struct inode *, long, struct ucred *, int); +static int chkiqchg(struct inode *, long, struct ucred *, int); +static int dqget(struct vnode *, + u_long, struct ufsmount *, int, struct dquot **); +static int dqsync(struct vnode *, struct dquot *); +static void dqflush(struct vnode *); #ifdef DIAGNOSTIC -static void dqref __P((struct dquot *)); -static void chkdquot __P((struct inode *)); +static void dqref(struct dquot *); +static void chkdquot(struct inode *); #endif /* diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 9dd3eab..8ed1596 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -81,41 +81,41 @@ #include <ufs/ufs/dirhash.h> #endif -static int ufs_access __P((struct vop_access_args *)); -static int ufs_advlock __P((struct vop_advlock_args *)); -static int ufs_chmod __P((struct vnode *, int, struct ucred *, struct thread *)); -static int ufs_chown __P((struct vnode *, uid_t, gid_t, struct ucred *, struct thread *)); -static int ufs_close __P((struct vop_close_args *)); -static int ufs_create __P((struct vop_create_args *)); -static int ufs_getattr __P((struct vop_getattr_args *)); -static int ufs_link __P((struct vop_link_args *)); -static int ufs_makeinode __P((int mode, struct vnode *, struct vnode **, struct componentname *)); -static int ufs_missingop __P((struct vop_generic_args *ap)); -static int ufs_mkdir __P((struct vop_mkdir_args *)); -static int ufs_mknod __P((struct vop_mknod_args *)); -static int ufs_open __P((struct vop_open_args *)); -static int ufs_pathconf __P((struct vop_pathconf_args *)); -static int ufs_print __P((struct vop_print_args *)); -static int ufs_readlink __P((struct vop_readlink_args *)); -static int ufs_remove __P((struct vop_remove_args *)); -static int ufs_rename __P((struct vop_rename_args *)); -static int ufs_rmdir __P((struct vop_rmdir_args *)); -static int ufs_setattr __P((struct vop_setattr_args *)); -static int ufs_strategy __P((struct vop_strategy_args *)); -static int ufs_symlink __P((struct vop_symlink_args *)); -static int ufs_whiteout __P((struct vop_whiteout_args *)); -static int ufsfifo_close __P((struct vop_close_args *)); -static int ufsfifo_kqfilter __P((struct vop_kqfilter_args *)); -static int ufsfifo_read __P((struct vop_read_args *)); -static int ufsfifo_write __P((struct vop_write_args *)); -static int ufsspec_close __P((struct vop_close_args *)); -static int ufsspec_read __P((struct vop_read_args *)); -static int ufsspec_write __P((struct vop_write_args *)); -static int filt_ufsread __P((struct knote *kn, long hint)); -static int filt_ufswrite __P((struct knote *kn, long hint)); -static int filt_ufsvnode __P((struct knote *kn, long hint)); -static void filt_ufsdetach __P((struct knote *kn)); -static int ufs_kqfilter __P((struct vop_kqfilter_args *ap)); +static int ufs_access(struct vop_access_args *); +static int ufs_advlock(struct vop_advlock_args *); +static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); +static int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); +static int ufs_close(struct vop_close_args *); +static int ufs_create(struct vop_create_args *); +static int ufs_getattr(struct vop_getattr_args *); +static int ufs_link(struct vop_link_args *); +static int ufs_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); +static int ufs_missingop(struct vop_generic_args *ap); +static int ufs_mkdir(struct vop_mkdir_args *); +static int ufs_mknod(struct vop_mknod_args *); +static int ufs_open(struct vop_open_args *); +static int ufs_pathconf(struct vop_pathconf_args *); +static int ufs_print(struct vop_print_args *); +static int ufs_readlink(struct vop_readlink_args *); +static int ufs_remove(struct vop_remove_args *); +static int ufs_rename(struct vop_rename_args *); +static int ufs_rmdir(struct vop_rmdir_args *); +static int ufs_setattr(struct vop_setattr_args *); +static int ufs_strategy(struct vop_strategy_args *); +static int ufs_symlink(struct vop_symlink_args *); +static int ufs_whiteout(struct vop_whiteout_args *); +static int ufsfifo_close(struct vop_close_args *); +static int ufsfifo_kqfilter(struct vop_kqfilter_args *); +static int ufsfifo_read(struct vop_read_args *); +static int ufsfifo_write(struct vop_write_args *); +static int ufsspec_close(struct vop_close_args *); +static int ufsspec_read(struct vop_read_args *); +static int ufsspec_write(struct vop_write_args *); +static int filt_ufsread(struct knote *kn, long hint); +static int filt_ufswrite(struct knote *kn, long hint); +static int filt_ufsvnode(struct knote *kn, long hint); +static void filt_ufsdetach(struct knote *kn); +static int ufs_kqfilter(struct vop_kqfilter_args *ap); union _qcvt { int64_t qcvt; diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h index 85c9866..12010a3 100644 --- a/sys/ufs/ufs/ufsmount.h +++ b/sys/ufs/ufs/ufsmount.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) |