Destatic.

ok krw@

3 files changed, 61 insertions, 66 deletions

diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index 9b87873bc34..ef1d6e46a2e 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_subr.c,v 1.27 2013/01/03 16:13:16 jsing Exp $	*/
+/*	$OpenBSD: ntfs_subr.c,v 1.28 2013/01/13 04:07:49 jsing Exp $	*/
 /*	$NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $	*/
 
 /*-
@@ -63,10 +63,10 @@ struct ntfs_lookup_ctx {
 	struct ntfs_lookup_ctx *prev;
 };
 
-static int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **);
-static int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t);
-static int ntfs_uastricmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
-static int ntfs_uastrcmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
+int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **);
+int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t);
+int ntfs_uastricmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
+int ntfs_uastrcmp(struct ntfsmount *, const wchar *, size_t, const char *, size_t);
 
 /* table for mapping Unicode chars into uppercase; it's filled upon first
  * ntfs mount, freed upon last ntfs umount */
@@ -99,7 +99,7 @@ ntfs_ntvattrrele(vap)
 /*
  * find the attribute in the ntnode
  */
-static int
+int
 ntfs_findvattr(ntmp, ip, lvapp, vapp, type, name, namelen, vcn)
 	struct ntfsmount *ntmp;
 	struct ntnode *ip;
@@ -655,7 +655,7 @@ ntfs_runtovrun(
 /*
  * Compare unicode and ascii string case insens.
  */
-static int
+int
 ntfs_uastricmp(ntmp, ustr, ustrlen, astr, astrlen)
 	struct ntfsmount *ntmp;
 	const wchar *ustr;
@@ -685,7 +685,7 @@ ntfs_uastricmp(ntmp, ustr, ustrlen, astr, astrlen)
 /*
  * Compare unicode and ascii string case sens.
  */
-static int
+int
 ntfs_uastrcmp(ntmp, ustr, ustrlen, astr, astrlen)
 	struct ntfsmount *ntmp;
 	const wchar *ustr;
@@ -790,7 +790,7 @@ ntfs_frele(
  * $ATTR_TYPE is searched in attrdefs read from $AttrDefs.
  * If $ATTR_TYPE not specified, ATTR_A_DATA assumed.
  */
-static int
+int
 ntfs_ntlookupattr(
 		struct ntfsmount * ntmp,
 		const char * name,
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 9a0849b5e37..76b92dd7b8f 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vfsops.c,v 1.30 2013/01/02 08:12:13 jsing Exp $	*/
+/*	$OpenBSD: ntfs_vfsops.c,v 1.31 2013/01/13 04:07:49 jsing Exp $	*/
 /*	$NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -55,36 +55,36 @@
 #include <ntfs/ntfs_ihash.h>
 #include <ntfs/ntfsmount.h>
 
-static int	ntfs_mount(struct mount *, const char *, void *,
+int	ntfs_mount(struct mount *, const char *, void *,
 				struct nameidata *, struct proc *);
-static int	ntfs_quotactl(struct mount *, int, uid_t, caddr_t,
+int	ntfs_quotactl(struct mount *, int, uid_t, caddr_t,
 				   struct proc *);
-static int	ntfs_root(struct mount *, struct vnode **);
-static int	ntfs_start(struct mount *, int, struct proc *);
-static int	ntfs_statfs(struct mount *, struct statfs *,
+int	ntfs_root(struct mount *, struct vnode **);
+int	ntfs_start(struct mount *, int, struct proc *);
+int	ntfs_statfs(struct mount *, struct statfs *,
 				 struct proc *);
-static int	ntfs_sync(struct mount *, int, struct ucred *,
+int	ntfs_sync(struct mount *, int, struct ucred *,
 			       struct proc *);
-static int	ntfs_unmount(struct mount *, int, struct proc *);
-static int	ntfs_vget(struct mount *mp, ino_t ino,
+int	ntfs_unmount(struct mount *, int, struct proc *);
+int	ntfs_vget(struct mount *mp, ino_t ino,
 			       struct vnode **vpp);
-static int	ntfs_mountfs(struct vnode *, struct mount *, 
+int	ntfs_mountfs(struct vnode *, struct mount *, 
 				  struct ntfs_args *, struct proc *);
-static int	ntfs_vptofh(struct vnode *, struct fid *);
+int	ntfs_vptofh(struct vnode *, struct fid *);
 
-static int	ntfs_init(struct vfsconf *);
-static int	ntfs_fhtovp(struct mount *, struct fid *,
+int	ntfs_init(struct vfsconf *);
+int	ntfs_fhtovp(struct mount *, struct fid *,
    			     struct vnode **);
-static int	ntfs_checkexp(struct mount *, struct mbuf *,
+int	ntfs_checkexp(struct mount *, struct mbuf *,
 			       int *, struct ucred **);
-static int	ntfs_sysctl(int *, u_int, void *, size_t *, void *,
+int	ntfs_sysctl(int *, u_int, void *, size_t *, void *,
  			     size_t, struct proc *);
 
 /*
  * Verify a remote client has export rights and return these rights via.
  * exflagsp and credanonp.
  */
-static int
+int
 ntfs_checkexp(mp, nam, exflagsp, credanonp)
 	struct mount *mp;
 	struct mbuf *nam;
@@ -106,8 +106,7 @@ ntfs_checkexp(mp, nam, exflagsp, credanonp)
 	return (0);
 }
 
-/*ARGSUSED*/
-static int
+int
 ntfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 	int *name;
 	u_int namelen;
@@ -120,7 +119,7 @@ ntfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 	return (EINVAL);
 }
 
-static int
+int
 ntfs_init (
 	struct vfsconf *vcp )
 {
@@ -129,7 +128,7 @@ ntfs_init (
 	return 0;
 }
 
-static int
+int
 ntfs_mount( 
 	struct mount *mp,
 	const char *path,
@@ -483,7 +482,7 @@ out:
 	return (error);
 }
 
-static int
+int
 ntfs_start (
 	struct mount *mp,
 	int flags,
@@ -492,7 +491,7 @@ ntfs_start (
 	return (0);
 }
 
-static int
+int
 ntfs_unmount( 
 	struct mount *mp,
 	int mntflags,
@@ -560,7 +559,7 @@ ntfs_unmount(
 	return (error);
 }
 
-static int
+int
 ntfs_root(
 	struct mount *mp,
 	struct vnode **vpp )
@@ -583,8 +582,7 @@ ntfs_root(
 /*
  * Do operations associated with quotas, not supported
  */
-/* ARGSUSED */
-static int
+int
 ntfs_quotactl ( 
 	struct mount *mp,
 	int cmds,
@@ -628,7 +626,7 @@ ntfs_calccfree(
 	return(error);
 }
 
-static int
+int
 ntfs_statfs(
 	struct mount *mp,
 	struct statfs *sbp,
@@ -660,7 +658,7 @@ ntfs_statfs(
 	return (0);
 }
 
-static int
+int
 ntfs_sync (
 	struct mount *mp,
 	int waitfor,
@@ -671,8 +669,7 @@ ntfs_sync (
 	return (0);
 }
 
-/*ARGSUSED*/
-static int
+int
 ntfs_fhtovp(
 	struct mount *mp,
 	struct fid *fhp,
@@ -696,7 +693,7 @@ ntfs_fhtovp(
 	return (0);
 }
 
-static int
+int
 ntfs_vptofh(
 	struct vnode *vp,
 	struct fid *fhp)
@@ -839,7 +836,7 @@ ntfs_vgetex(
 	return (0);
 }
 
-static int
+int
 ntfs_vget(
 	struct mount *mp,
 	ino_t ino,
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index 3a7e673cf41..a1d5458a282 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vnops.c,v 1.27 2013/01/03 16:06:01 jsing Exp $	*/
+/*	$OpenBSD: ntfs_vnops.c,v 1.28 2013/01/13 04:07:49 jsing Exp $	*/
 /*	$NetBSD: ntfs_vnops.c,v 1.6 2003/04/10 21:57:26 jdolecek Exp $	*/
 
 /*
@@ -56,21 +56,21 @@
 
 #include <sys/unistd.h> /* for pathconf(2) constants */
 
-static int	ntfs_read(void *);
-static int	ntfs_write(void *);
-static int	ntfs_getattr(void *);
-static int	ntfs_inactive(void *);
-static int	ntfs_print(void *);
-static int	ntfs_reclaim(void *);
-static int	ntfs_strategy(void *);
-static int	ntfs_access(void *);
-static int	ntfs_open(void *);
-static int	ntfs_close(void *);
-static int	ntfs_readdir(void *);
-static int	ntfs_lookup(void *);
-static int	ntfs_bmap(void *);
-static int	ntfs_fsync(void *);
-static int	ntfs_pathconf(void *);
+int	ntfs_read(void *);
+int	ntfs_write(void *);
+int	ntfs_getattr(void *);
+int	ntfs_inactive(void *);
+int	ntfs_print(void *);
+int	ntfs_reclaim(void *);
+int	ntfs_strategy(void *);
+int	ntfs_access(void *v);
+int	ntfs_open(void *v);
+int	ntfs_close(void *);
+int	ntfs_readdir(void *);
+int	ntfs_lookup(void *);
+int	ntfs_bmap(void *);
+int	ntfs_fsync(void *);
+int	ntfs_pathconf(void *);
 
 int	ntfs_prtactive = 0;	/* 1 => print out reclaim of active vnodes */
 
@@ -91,7 +91,7 @@ ntfs_bmap(void *v)
 	return (0);
 }
 
-static int
+int
 ntfs_read(void *v)
 {
 	struct vop_read_args *ap = v;
@@ -128,7 +128,7 @@ ntfs_read(void *v)
 	return (0);
 }
 
-static int
+int
 ntfs_getattr(void *v)
 {
 	struct vop_getattr_args *ap = v;
@@ -232,7 +232,7 @@ ntfs_reclaim(void *v)
 	return (0);
 }
 
-static int
+int
 ntfs_print(void *v)
 {
 	struct vop_print_args *ap = v;
@@ -321,7 +321,7 @@ ntfs_strategy(void *v)
 	return (error);
 }
 
-static int
+int
 ntfs_write(void *v)
 {
 	struct vop_write_args *ap = v;
@@ -429,8 +429,7 @@ ntfs_access(void *v)
  *
  * Nothing to do.
  */
-/* ARGSUSED */
-static int
+int
 ntfs_open(void *v)
 {
 #if NTFS_DEBUG
@@ -453,8 +452,7 @@ ntfs_open(void *v)
  *
  * Update the times on the inode.
  */
-/* ARGSUSED */
-static int
+int
 ntfs_close(void *v)
 {
 #if NTFS_DEBUG
@@ -710,7 +708,7 @@ ntfs_lookup(void *v)
  * This function is worthless for vnodes that represent directories. Maybe we
  * could just do a sync if they try an fsync on a directory file.
  */
-static int
+int
 ntfs_fsync(void *v)
 {
 	return (0);
@@ -719,7 +717,7 @@ ntfs_fsync(void *v)
 /*
  * Return POSIX pathconf information applicable to NTFS filesystem
  */
-static int
+int
 ntfs_pathconf(void *v)
 {
 	struct vop_pathconf_args *ap = v;