diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index 74e15429fcaf..3557e0bd8ceb 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -62,6 +62,7 @@ #include #include +static int portal_init __P((struct vfsconf *)); static int portal_mount __P((struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, struct proc *p)); static int portal_start __P((struct mount *mp, int flags, struct proc *p)); diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c index 68b93dd9aebb..30dd929536ee 100644 --- a/sys/fs/procfs/procfs_ctl.c +++ b/sys/fs/procfs/procfs_ctl.c @@ -55,6 +55,9 @@ #include #include +#include +#include + #ifndef FIX_SSTEP #define FIX_SSTEP(p) #endif diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c index 85be3ea779c2..34dc165ed6bc 100644 --- a/sys/fs/procfs/procfs_vnops.c +++ b/sys/fs/procfs/procfs_vnops.c @@ -62,6 +62,7 @@ static int procfs_abortop __P((struct vop_abortop_args *)); static int procfs_access __P((struct vop_access_args *)); static int procfs_badop __P((void)); +static int procfs_bmap __P((struct vop_bmap_args *)); static int procfs_close __P((struct vop_close_args *)); static int procfs_getattr __P((struct vop_getattr_args *)); static int procfs_inactive __P((struct vop_inactive_args *)); @@ -71,6 +72,7 @@ static int procfs_open __P((struct vop_open_args *)); static int procfs_pathconf __P((struct vop_pathconf_args *ap)); static int procfs_print __P((struct vop_print_args *)); static int procfs_readdir __P((struct vop_readdir_args *)); +static int procfs_readlink __P((struct vop_readlink_args *)); static int procfs_reclaim __P((struct vop_reclaim_args *)); static int procfs_setattr __P((struct vop_setattr_args *)); @@ -208,7 +210,7 @@ procfs_ioctl(ap) * usual no-op bmap, although returning * (EIO) would be a reasonable alternative. */ -int +static int procfs_bmap(ap) struct vop_bmap_args /* { struct vnode *a_vp; @@ -894,7 +896,7 @@ procfs_readdir(ap) /* * readlink reads the link of `curproc' */ -int +static int procfs_readlink(ap) struct vop_readlink_args *ap; { diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 63e25e6a0c36..837d02595a73 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -50,7 +50,8 @@ #include #include #include -#include /* for vnode_pager_setsize */ +#include +#include /* for vnode_pager_setsize */ #include #include diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h index de6cd08f0bf4..cbd06e907560 100644 --- a/sys/gnu/ext2fs/ext2_extern.h +++ b/sys/gnu/ext2fs/ext2_extern.h @@ -46,6 +46,7 @@ struct dinode; struct ext2_inode; struct inode; struct mount; +struct vfsconf; struct vnode; int ext2_alloc __P((struct inode *, diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h index de6cd08f0bf4..cbd06e907560 100644 --- a/sys/gnu/fs/ext2fs/ext2_extern.h +++ b/sys/gnu/fs/ext2fs/ext2_extern.h @@ -46,6 +46,7 @@ struct dinode; struct ext2_inode; struct inode; struct mount; +struct vfsconf; struct vnode; int ext2_alloc __P((struct inode *, diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index b7744878af75..7af6e65913c2 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -58,6 +58,7 @@ dev_t rrootdev = NODEV; static int cdevvp __P((dev_t dev, struct vnode **vpp)); +static void kernfs_get_rrootdev __P((void)); static int kernfs_init __P((struct vfsconf *vfsp)); static int kernfs_mount __P((struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, struct proc *p)); @@ -76,7 +77,7 @@ kernfs_init(vfsp) return (0); } -void +static void kernfs_get_rrootdev() { static int tried = 0; diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c index 74e15429fcaf..3557e0bd8ceb 100644 --- a/sys/miscfs/portal/portal_vfsops.c +++ b/sys/miscfs/portal/portal_vfsops.c @@ -62,6 +62,7 @@ #include #include +static int portal_init __P((struct vfsconf *)); static int portal_mount __P((struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, struct proc *p)); static int portal_start __P((struct mount *mp, int flags, struct proc *p)); diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c index 68b93dd9aebb..30dd929536ee 100644 --- a/sys/miscfs/procfs/procfs_ctl.c +++ b/sys/miscfs/procfs/procfs_ctl.c @@ -55,6 +55,9 @@ #include #include +#include +#include + #ifndef FIX_SSTEP #define FIX_SSTEP(p) #endif diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 85be3ea779c2..34dc165ed6bc 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -62,6 +62,7 @@ static int procfs_abortop __P((struct vop_abortop_args *)); static int procfs_access __P((struct vop_access_args *)); static int procfs_badop __P((void)); +static int procfs_bmap __P((struct vop_bmap_args *)); static int procfs_close __P((struct vop_close_args *)); static int procfs_getattr __P((struct vop_getattr_args *)); static int procfs_inactive __P((struct vop_inactive_args *)); @@ -71,6 +72,7 @@ static int procfs_open __P((struct vop_open_args *)); static int procfs_pathconf __P((struct vop_pathconf_args *ap)); static int procfs_print __P((struct vop_print_args *)); static int procfs_readdir __P((struct vop_readdir_args *)); +static int procfs_readlink __P((struct vop_readlink_args *)); static int procfs_reclaim __P((struct vop_reclaim_args *)); static int procfs_setattr __P((struct vop_setattr_args *)); @@ -208,7 +210,7 @@ procfs_ioctl(ap) * usual no-op bmap, although returning * (EIO) would be a reasonable alternative. */ -int +static int procfs_bmap(ap) struct vop_bmap_args /* { struct vnode *a_vp; @@ -894,7 +896,7 @@ procfs_readdir(ap) /* * readlink reads the link of `curproc' */ -int +static int procfs_readlink(ap) struct vop_readlink_args *ap; { diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index 63e25e6a0c36..837d02595a73 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -50,7 +50,8 @@ #include #include #include -#include /* for vnode_pager_setsize */ +#include +#include /* for vnode_pager_setsize */ #include #include diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 90a4fde6f9ba..2a810f418d93 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -407,6 +407,7 @@ void vfs_getnewfsid __P((struct mount *)); struct mount *vfs_getvfs __P((fsid_t *)); /* return vfs given fsid */ int vfs_mountedon __P((struct vnode *)); /* is a vfs mounted on vp */ int vfs_mountroot __P((char *)); +int vfs_mountrootfs __P((char *)); int vfs_rootmountalloc __P((char *, char *, struct mount **)); void vfs_unbusy __P((struct mount *, struct proc *)); void vfs_unmountall __P((void)); diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index f168d01d85f7..d67e403a01cf 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -75,6 +75,7 @@ int ffs_bmap __P((struct vop_bmap_args *)); void ffs_clrblock __P((struct fs *, u_char *, ufs_daddr_t)); int ffs_fhtovp __P((struct mount *, struct fid *, struct mbuf *, struct vnode **, int *, struct ucred **)); +int ffs_flushfiles __P((struct mount *, int, struct proc *)); void ffs_fragacct __P((struct fs *, int, int32_t [], int)); int ffs_isblock __P((struct fs *, u_char *, ufs_daddr_t)); int ffs_mountfs __P((struct vnode *, struct mount *, struct proc *)); @@ -95,6 +96,7 @@ int ffs_vget __P((struct mount *, ino_t, struct vnode **)); int ffs_vptofh __P((struct vnode *, struct fid *)); #ifdef DIAGNOSTIC +int ffs_checkblk __P((struct inode *, ufs_daddr_t, long)); void ffs_checkoverlap __P((struct buf *, struct inode *)); #endif diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index a450e926aaea..37fbaff549d1 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -67,6 +67,8 @@ 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 *)); int ufs_direnter __P((struct inode *, struct vnode *,struct componentname *)); +int ufs_direnter2 __P((struct vnode *, struct direct *, struct ucred *, + struct proc *)); int ufs_dirremove __P((struct vnode *, struct componentname*)); int ufs_dirrewrite __P((struct inode *, struct inode *, struct componentname *));