From a0110b5e9e4a545eda44563abb846397cc742557 Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 10 Feb 2005 12:20:08 +0000 Subject: Make a some SYSCTL_NODEs and some of FFS's VFS_ methods static. --- sys/ufs/ffs/ffs_alloc.c | 10 +++++----- sys/ufs/ffs/ffs_extern.h | 5 ----- sys/ufs/ffs/ffs_vfsops.c | 19 ++++++++++++------- sys/ufs/ufs/ufs_dirhash.c | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'sys/ufs') diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 1c2bda9..9878694 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -2289,19 +2289,19 @@ 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"); -SYSCTL_NODE(_vfs_ffs, FFS_ADJ_BLKCNT, adjblkcnt, CTLFLAG_WR, +static SYSCTL_NODE(_vfs_ffs, FFS_ADJ_BLKCNT, adjblkcnt, CTLFLAG_WR, sysctl_ffs_fsck, "Adjust Inode Used Blocks Count"); -SYSCTL_NODE(_vfs_ffs, FFS_DIR_FREE, freedirs, CTLFLAG_WR, +static SYSCTL_NODE(_vfs_ffs, FFS_DIR_FREE, freedirs, CTLFLAG_WR, sysctl_ffs_fsck, "Free Range of Directory Inodes"); -SYSCTL_NODE(_vfs_ffs, FFS_FILE_FREE, freefiles, CTLFLAG_WR, +static SYSCTL_NODE(_vfs_ffs, FFS_FILE_FREE, freefiles, CTLFLAG_WR, sysctl_ffs_fsck, "Free Range of File Inodes"); -SYSCTL_NODE(_vfs_ffs, FFS_BLK_FREE, freeblks, CTLFLAG_WR, +static SYSCTL_NODE(_vfs_ffs, FFS_BLK_FREE, freeblks, CTLFLAG_WR, sysctl_ffs_fsck, "Free Range of Blocks"); -SYSCTL_NODE(_vfs_ffs, FFS_SET_FLAGS, setflags, CTLFLAG_WR, +static SYSCTL_NODE(_vfs_ffs, FFS_SET_FLAGS, setflags, CTLFLAG_WR, sysctl_ffs_fsck, "Change Filesystem Flags"); #ifdef DEBUG diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index a836cb8..cdc838e 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -62,7 +62,6 @@ ufs2_daddr_t ffs_blkpref_ufs2(struct inode *, ufs_lbn_t, int, ufs2_daddr_t *); int ffs_checkfreefile(struct fs *, struct vnode *, ino_t); void ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t); int ffs_copyonwrite(struct vnode *, struct buf *); -vfs_fhtovp_t ffs_fhtovp; int ffs_flushfiles(struct mount *, int, struct thread *); void ffs_fragacct(struct fs *, int, int32_t [], int); int ffs_freefile(struct ufsmount *, struct fs *, struct vnode *, ino_t, @@ -79,17 +78,13 @@ 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); -vfs_statfs_t ffs_statfs; -vfs_sync_t ffs_sync; int ffs_syncvnode(struct vnode *vp, int waitfor); int ffs_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *); -vfs_unmount_t ffs_unmount; int ffs_update(struct vnode *, int); int ffs_valloc(struct vnode *, int, struct ucred *, struct vnode **); int ffs_vfree(struct vnode *, ino_t, int); vfs_vget_t ffs_vget; -vfs_vptofh_t ffs_vptofh; extern struct vop_vector ffs_vnodeops1; extern struct vop_vector ffs_fifoops1; diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index a7317e3..0499224 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include #include -uma_zone_t uma_inode, uma_ufs1, uma_ufs2; +static uma_zone_t uma_inode, uma_ufs1, uma_ufs2; static int ffs_sbupdate(struct ufsmount *, int); static int ffs_reload(struct mount *, struct thread *); @@ -81,7 +81,12 @@ static vfs_init_t ffs_init; static vfs_uninit_t ffs_uninit; static vfs_extattrctl_t ffs_extattrctl; static vfs_cmount_t ffs_cmount; +static vfs_unmount_t ffs_unmount; static vfs_mount_t ffs_mount; +static vfs_statfs_t ffs_statfs; +static vfs_fhtovp_t ffs_fhtovp; +static vfs_vptofh_t ffs_vptofh; +static vfs_sync_t ffs_sync; static struct vfsops ufs_vfsops = { .vfs_extattrctl = ffs_extattrctl, @@ -807,7 +812,7 @@ out: } #include -int bigcgs = 0; +static int bigcgs = 0; SYSCTL_INT(_debug, OID_AUTO, bigcgs, CTLFLAG_RW, &bigcgs, 0, ""); /* @@ -903,7 +908,7 @@ ffs_oldfscompat_write(fs, ump) /* * unmount system call */ -int +static int ffs_unmount(mp, mntflags, td) struct mount *mp; int mntflags; @@ -1024,7 +1029,7 @@ ffs_flushfiles(mp, flags, td) /* * Get filesystem statistics. */ -int +static int ffs_statfs(mp, sbp, td) struct mount *mp; struct statfs *sbp; @@ -1060,7 +1065,7 @@ ffs_statfs(mp, sbp, td) * * Note: we are always called with the filesystem marked `MPBUSY'. */ -int +static int ffs_sync(mp, waitfor, td) struct mount *mp; int waitfor; @@ -1349,7 +1354,7 @@ ffs_vget(mp, ino, flags, vpp) * - check that the given client host has export rights and return * those rights via. exflagsp and credanonp */ -int +static int ffs_fhtovp(mp, fhp, vpp) struct mount *mp; struct fid *fhp; @@ -1370,7 +1375,7 @@ ffs_fhtovp(mp, fhp, vpp) * Vnode pointer to File handle */ /* ARGSUSED */ -int +static int ffs_vptofh(vp, fhp) struct vnode *vp; struct fid *fhp; diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c index 3f5d9f3..d8542e8 100644 --- a/sys/ufs/ufs/ufs_dirhash.c +++ b/sys/ufs/ufs/ufs_dirhash.c @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_DIRHASH, "UFS dirhash", "UFS directory hash tables"); -SYSCTL_NODE(_vfs, OID_AUTO, ufs, CTLFLAG_RD, 0, "UFS filesystem"); +static SYSCTL_NODE(_vfs, OID_AUTO, ufs, CTLFLAG_RD, 0, "UFS filesystem"); static int ufs_mindirhashsize = DIRBLKSIZ * 5; SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_minsize, CTLFLAG_RW, -- cgit v1.1