- remove super-obvious comments from vnodeop_entries[]

- remove #ifdef someos blocks, makes this a tad easier to read

agreed by art@ and thib@

9 files changed, 17 insertions, 785 deletions

diff --git a/sys/ntfs/ntfs.h b/sys/ntfs/ntfs.h
index dcbaa9f835b..6cb9555c0fa 100644
--- a/sys/ntfs/ntfs.h
+++ b/sys/ntfs/ntfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs.h,v 1.6 2008/09/01 17:30:56 deraadt Exp $	*/
+/*	$OpenBSD: ntfs.h,v 1.7 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs.h,v 1.5 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -282,27 +282,6 @@ struct ntfsmount {
 #define ntfs_btocnoff(off)	(off_t)((off) % ((ntmp)->ntm_spc * (ntmp)->ntm_bps))
 #define ntfs_bntob(bn)	(int32_t)((bn) * (ntmp)->ntm_bps)
 
-#if __FreeBSD_version >= 300000 || defined(__NetBSD__)
-MALLOC_DECLARE(M_NTFSMNT);
-MALLOC_DECLARE(M_NTFSNTNODE);
-MALLOC_DECLARE(M_NTFSFNODE);
-MALLOC_DECLARE(M_NTFSDIR);
-MALLOC_DECLARE(M_NTFSNTHASH);
-MALLOC_DECLARE(M_NTFSNTVATTR);
-MALLOC_DECLARE(M_NTFSRDATA);
-MALLOC_DECLARE(M_NTFSDECOMP);
-MALLOC_DECLARE(M_NTFSRUN);
-#endif
-
-#ifdef __NetBSD__
-typedef int (vop_t)(void *);
-#define HASHINIT(a, b, c, d)	hashinit((a), HASH_LIST, (b), (c), (d))
-#define bqrelse(bp)		brelse(bp)
-#define VOP__UNLOCK(a, b, c)	VOP_UNLOCK((a), (b))
-#define VGET(a, b, c)		vget((a), (b))
-#define VN_LOCK(a, b, c)	vn_lock((a), (b))
-
-#elif defined(__OpenBSD__)
 typedef int (vop_t)(void *);
 #define HASHINIT(a, b, c, d)	hashinit((a), (b), (c), (d))
 #define bqrelse(bp)		brelse(bp)
@@ -310,17 +289,6 @@ typedef int (vop_t)(void *);
 #define VGET(a, b, c)		vget((a), (b), (c))
 #define VN_LOCK(a, b, c)	vn_lock((a), (b), (c))
 
-#else /* !NetBSD && !OpenBSD */
-#define HASHINIT(a, b, c, d)	hashinit((a), (b), (d))
-#define VOP__UNLOCK(a, b, c)	VOP_UNLOCK((a), (b), (c))
-#define VGET(a, b, c)		vget((a), (b), (c))
-#define VN_LOCK(a, b, c)	vn_lock((a), (b), (c))
-
-/* PDIRUNLOCK is used by NetBSD to mark if vfs_lookup() unlocked parent dir;
- * on FreeBSD, it's not defined and nothing similar exists */
-#define PDIRUNLOCK		0
-#endif /* NetBSD */
-
 #if defined(NTFS_DEBUG)
 extern int ntfs_debug;
 #define DPRINTF(X, Y) do { if(ntfs_debug >= (X)) printf Y; } while(0)
diff --git a/sys/ntfs/ntfs_compr.c b/sys/ntfs/ntfs_compr.c
index 22fa9ce55ed..50d08ed3b5e 100644
--- a/sys/ntfs/ntfs_compr.c
+++ b/sys/ntfs/ntfs_compr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_compr.c,v 1.3 2008/05/13 02:24:08 brad Exp $	*/
+/*	$OpenBSD: ntfs_compr.c,v 1.4 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_compr.c,v 1.1 2002/12/23 17:38:31 jdolecek Exp $	*/
 
 /*-
@@ -39,19 +39,11 @@
 #include <sys/buf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
-#ifdef __FreeBSD__
-#include <machine/clock.h>
-#endif
 
 #include <miscfs/specfs/specdev.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <fs/ntfs/ntfs.h>
-#include <fs/ntfs/ntfs_compr.h>
-#else
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_compr.h>
-#endif
 
 #define GET_UINT16(addr)	(*((u_int16_t *)(addr)))
 
diff --git a/sys/ntfs/ntfs_conv.c b/sys/ntfs/ntfs_conv.c
index 77c30d1ae42..683d32be269 100644
--- a/sys/ntfs/ntfs_conv.c
+++ b/sys/ntfs/ntfs_conv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_conv.c,v 1.6 2009/03/25 20:39:47 oga Exp $	*/
+/*	$OpenBSD: ntfs_conv.c,v 1.7 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_conv.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $	*/
 
 /*-
@@ -43,22 +43,10 @@
 #include <sys/buf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
-#if defined(__FreeBSD__)
-#include <machine/clock.h>
-#endif
 
 #include <miscfs/specfs/specdev.h>
 
 /* #define NTFS_DEBUG 1 */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <fs/ntfs/ntfs.h>
-#include <fs/ntfs/ntfsmount.h>
-#include <fs/ntfs/ntfs_inode.h>
-#include <fs/ntfs/ntfs_vfsops.h>
-#include <fs/ntfs/ntfs_subr.h>
-#include <fs/ntfs/ntfs_compr.h>
-#include <fs/ntfs/ntfs_ihash.h>
-#else
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfsmount.h>
 #include <ntfs/ntfs_inode.h>
@@ -66,7 +54,6 @@
 #include <ntfs/ntfs_subr.h>
 #include <ntfs/ntfs_compr.h>
 #include <ntfs/ntfs_ihash.h>
-#endif
 
 /* UTF-8 encoding stuff */
 
diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c
index a7138ca4e97..190f73fa843 100644
--- a/sys/ntfs/ntfs_ihash.c
+++ b/sys/ntfs/ntfs_ihash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_ihash.c,v 1.5 2009/03/25 20:39:47 oga Exp $	*/
+/*	$OpenBSD: ntfs_ihash.c,v 1.6 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_ihash.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $	*/
 
 /*
@@ -43,15 +43,9 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <fs/ntfs/ntfs.h>
-#include <fs/ntfs/ntfs_inode.h>
-#include <fs/ntfs/ntfs_ihash.h>
-#else
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_inode.h>
 #include <ntfs/ntfs_ihash.h>
-#endif
 
 #ifdef MALLOC_DEFINE
 MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables");
@@ -79,48 +73,6 @@ ntfs_nthashinit()
 	simple_lock_init(&ntfs_nthash_slock);
 }
 
-#ifdef __NetBSD__
-/*
- * Reinitialize inode hash table.
- */
-
-void
-ntfs_nthashreinit()
-{
-	struct ntnode *ip;
-	struct nthashhead *oldhash, *hash;
-	u_long oldmask, mask, val;
-	int i;
-
-	hash = HASHINIT(desiredvnodes, M_NTFSNTHASH, M_WAITOK, &mask);
-
-	simple_lock(&ntfs_nthash_slock);
-	oldhash = ntfs_nthashtbl;
-	oldmask = ntfs_nthash;
-	ntfs_nthashtbl = hash;
-	ntfs_nthash = mask;
-	for (i = 0; i <= oldmask; i++) {
-		while ((ip = LIST_FIRST(&oldhash[i])) != NULL) {
-			LIST_REMOVE(ip, i_hash);
-			val = NTNOHASH(ip->i_dev, ip->i_number);
-			LIST_INSERT_HEAD(&hash[val], ip, i_hash);
-		}
-	}
-	simple_unlock(&ntfs_nthash_slock);
-	hashdone(oldhash, M_NTFSNTHASH);
-}
-
-/*
- * Free the inode hash table. Called from ntfs_done(), only needed
- * on NetBSD.
- */
-void
-ntfs_nthashdone()
-{
-	hashdone(ntfs_nthashtbl, M_NTFSNTHASH);
-}
-#endif
-
 /*
  * Use the device/inum pair to find the incore inode, and return a pointer
  * to it. If it is in core, return it, even if it is locked.
diff --git a/sys/ntfs/ntfs_inode.h b/sys/ntfs/ntfs_inode.h
index 6a1b73423b8..282303ba36a 100644
--- a/sys/ntfs/ntfs_inode.h
+++ b/sys/ntfs/ntfs_inode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_inode.h,v 1.4 2009/03/25 20:39:47 oga Exp $	*/
+/*	$OpenBSD: ntfs_inode.h,v 1.5 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_inode.h,v 1.1 2002/12/23 17:38:33 jdolecek Exp $	*/
 
 /*-
@@ -29,34 +29,6 @@
  *	Id: ntfs_inode.h,v 1.4 1999/05/12 09:43:00 semenu Exp
  */
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <miscfs/genfs/genfs_node.h>
-#endif
-
-/* These flags are kept in i_flag. */
-#if defined(__FreeBSD__)
-#define	IN_ACCESS	0x0001	/* Access time update request. */
-#define	IN_CHANGE	0x0002	/* Inode change time update request. */
-#define	IN_UPDATE	0x0004	/* Modification time update request. */
-#define	IN_MODIFIED	0x0008	/* Inode has been modified. */
-#define	IN_RENAME	0x0010	/* Inode is being renamed. */
-#define	IN_SHLOCK	0x0020	/* File has shared lock. */
-#define	IN_EXLOCK	0x0040	/* File has exclusive lock. */
-#define	IN_LAZYMOD	0x0080	/* Modified, but don't write yet. */
-#else /* defined(__NetBSD__) */
-#define	IN_ACCESS	0x0001	/* Access time update request. */
-#define	IN_CHANGE	0x0002	/* Inode change time update request. */
-#define	IN_EXLOCK	0x0004	/* File has exclusive lock. */
-#define	IN_LOCKED	0x0008	/* Inode lock. */
-#define	IN_LWAIT	0x0010	/* Process waiting on file lock. */
-#define	IN_MODIFIED	0x0020	/* Inode has been modified. */
-#define	IN_RENAME	0x0040	/* Inode is being renamed. */
-#define	IN_SHLOCK	0x0080	/* File has shared lock. */
-#define	IN_UPDATE	0x0100	/* Modification time update request. */
-#define	IN_WANTED	0x0200	/* Inode is wanted by a process. */
-#define	IN_RECURSE	0x0400	/* Recursion expected */
-#endif
-
 #define	IN_HASHED	0x0800	/* Inode is on hash list */
 #define	IN_LOADED	0x8000	/* ntvattrs loaded */
 #define	IN_PRELOADED	0x4000	/* loaded from directory entry */
@@ -88,13 +60,6 @@ struct ntnode {
 #define	FN_VALID	0x0002
 #define	FN_AATTRNAME	0x0004	/* space allocated for f_attrname */
 struct fnode {
-#ifdef __FreeBSD__
-	struct lock	f_lock;	/* fnode lock >Keep this first< */
-#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-	struct genfs_node f_gnode;
-#endif
-
 	LIST_ENTRY(fnode) f_fnlist;
 	struct vnode   *f_vp;		/* Associatied vnode */
 	struct ntnode  *f_ip;		/* Associated ntnode */
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index 57c95b4d9d1..00b57cdec67 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_subr.c,v 1.17 2009/07/09 22:29:56 thib Exp $	*/
+/*	$OpenBSD: ntfs_subr.c,v 1.18 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $	*/
 
 /*-
@@ -40,22 +40,10 @@
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/rwlock.h>
-#if defined(__FreeBSD__)
-#include <machine/clock.h>
-#endif
 
 #include <miscfs/specfs/specdev.h>
 
 /* #define NTFS_DEBUG 1 */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <fs/ntfs/ntfs.h>
-#include <fs/ntfs/ntfsmount.h>
-#include <fs/ntfs/ntfs_inode.h>
-#include <fs/ntfs/ntfs_vfsops.h>
-#include <fs/ntfs/ntfs_subr.h>
-#include <fs/ntfs/ntfs_compr.h>
-#include <fs/ntfs/ntfs_ihash.h>
-#else
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfsmount.h>
 #include <ntfs/ntfs_inode.h>
@@ -63,7 +51,6 @@
 #include <ntfs/ntfs_subr.h>
 #include <ntfs/ntfs_compr.h>
 #include <ntfs/ntfs_ihash.h>
-#endif
 
 #if defined(NTFS_DEBUG)
 int ntfs_debug = NTFS_DEBUG;
@@ -379,9 +366,7 @@ out:
 int
 ntfs_ntget(
 	struct ntnode *ip,
-#ifdef __OpenBSD__
 	struct proc *p
-#endif
 	)
 {
 	dprintf(("ntfs_ntget: get ntnode %d: %p, usecount: %d\n",
@@ -405,12 +390,8 @@ int
 ntfs_ntlookup(
 	   struct ntfsmount * ntmp,
 	   ino_t ino,
-#ifndef __OpenBSD__
-	   struct ntnode ** ipp)
-#else
 	   struct ntnode ** ipp,
 	   struct proc * p)
-#endif
 {
 	struct ntnode  *ip;
 
@@ -418,11 +399,7 @@ ntfs_ntlookup(
 
 	do {
 		if ((ip = ntfs_nthashlookup(ntmp->ntm_dev, ino)) != NULL) {
-#ifndef __OpenBSD__
-			ntfs_ntget(ip);
-#else
 			ntfs_ntget(ip, p);
-#endif
 			dprintf(("ntfs_ntlookup: ntnode %d: %p, usecount: %d\n",
 				ino, ip, ip->i_usecount));
 			*ipp = ip;
@@ -444,11 +421,7 @@ ntfs_ntlookup(
 
 	/* init lock and lock the newborn ntnode */
 	rw_init(&ip->i_lock, "ntnode");
-#ifndef __OpenBSD__
-	ntfs_ntget(ip);
-#else
 	ntfs_ntget(ip, p);
-#endif
 
 	ntfs_nthashins(ip);
 
@@ -471,9 +444,7 @@ ntfs_ntlookup(
 void
 ntfs_ntput(
 	struct ntnode *ip,
-#ifdef __OpenBSD__
 	struct proc *p
-#endif
 	)
 {
 	struct ntvattr *vap;
@@ -889,12 +860,8 @@ ntfs_ntlookupfile(
 	      struct ntfsmount * ntmp,
 	      struct vnode * vp,
 	      struct componentname * cnp,
-#ifndef __OpenBSD__
-	      struct vnode ** vpp)
-#else
 	      struct vnode ** vpp,
 	      struct proc *p)
-#endif
 {
 	struct fnode   *fp = VTOF(vp);
 	struct ntnode  *ip = FTONT(fp);
@@ -915,11 +882,8 @@ ntfs_ntlookupfile(
 	int fullscan = 0;
 	struct ntfs_lookup_ctx *lookup_ctx = NULL, *tctx;
 
-#ifndef __OpenBSD__
-	error = ntfs_ntget(ip);
-#else
 	error = ntfs_ntget(ip, p);
-#endif
+
 	if (error)
 		return (error);
 
@@ -1151,11 +1115,7 @@ fail:
 		}
 	}
 	ntfs_ntvattrrele(vap);
-#ifndef __OpenBSD__
-	ntfs_ntput(ip);
-#else
 	ntfs_ntput(ip, p);
-#endif
 	free(rdbuf, M_TEMP);
 	return (error);
 }
@@ -1199,12 +1159,8 @@ ntfs_ntreaddir(
 	       struct ntfsmount * ntmp,
 	       struct fnode * fp,
 	       u_int32_t num,
-#ifndef __OpenBSD__
-	       struct attr_indexentry ** riepp)
-#else
 	       struct attr_indexentry ** riepp,
 	       struct proc *p)
-#endif
 {
 	struct ntnode  *ip = FTONT(fp);
 	struct ntvattr *vap = NULL;	/* IndexRoot attribute */
@@ -1222,11 +1178,7 @@ ntfs_ntreaddir(
 	u_int32_t       aoff, cnum;
 
 	dprintf(("ntfs_ntreaddir: read ino: %d, num: %d\n", ip->i_number, num));
-#ifndef __OpenBSD__
-	error = ntfs_ntget(ip);
-#else
 	error = ntfs_ntget(ip, p);
-#endif
 	if (error)
 		return (error);
 
@@ -1359,11 +1311,8 @@ fail:
 		ntfs_ntvattrrele(iavap);
 	if (bmp)
 		free(bmp, M_TEMP);
-#ifndef __OpenBSD__
-	ntfs_ntput(ip);
-#else
 	ntfs_ntput(ip, p);
-#endif
+
 	return (error);
 }
 
@@ -1385,38 +1334,6 @@ ntfs_nttimetounix(
 	return (t);
 }
 
-#ifndef __OpenBSD__
-/*
- * Get file times from NTFS_A_NAME attribute.
- */
-int
-ntfs_times(
-	   struct ntfsmount * ntmp,
-	   struct ntnode * ip,
-	   ntfs_times_t * tm)
-{
-	struct ntvattr *vap;
-	int             error;
-
-	dprintf(("ntfs_times: ino: %d...\n", ip->i_number));
-
-	error = ntfs_ntget(ip);
-	if (error)
-		return (error);
-
-	error = ntfs_ntvattrget(ntmp, ip, NTFS_A_NAME, NULL, 0, &vap);
-	if (error) {
-		ntfs_ntput(ip);
-		return (error);
-	}
-	*tm = vap->va_a_name->n_times;
-	ntfs_ntvattrrele(vap);
-	ntfs_ntput(ip);
-
-	return (0);
-}
-#endif
-
 /*
  * Get file sizes from corresponding attribute. 
  * 
@@ -2062,16 +1979,10 @@ ntfs_toupper_init()
  * otherwise read the data from the filesystem we are currently mounting
  */
 int
-#ifndef __OpenBSD__
-ntfs_toupper_use(mp, ntmp)
-	struct mount *mp;
-	struct ntfsmount *ntmp;
-#else
 ntfs_toupper_use(mp, ntmp, p)
 	struct mount *mp;
 	struct ntfsmount *ntmp;
 	struct proc *p;
-#endif
 {
 	int error = 0;
 	struct vnode *vp;
@@ -2110,12 +2021,8 @@ ntfs_toupper_use(mp, ntmp, p)
  * tied by toupper table
  */
 void
-#ifndef __OpenBSD__
-ntfs_toupper_unuse()
-#else
 ntfs_toupper_unuse(p)
 	struct proc *p;
-#endif
 {
 	/* get exclusive access */
 	rw_enter_write(&ntfs_toupper_lock);
diff --git a/sys/ntfs/ntfs_subr.h b/sys/ntfs/ntfs_subr.h
index 4d1aa088cd5..00296cdf16e 100644
--- a/sys/ntfs/ntfs_subr.h
+++ b/sys/ntfs/ntfs_subr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_subr.h,v 1.3 2003/05/20 03:36:42 tedu Exp $	*/
+/*	$OpenBSD: ntfs_subr.h,v 1.4 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_subr.h,v 1.1 2002/12/23 17:38:33 jdolecek Exp $	*/
 
 /*-
@@ -71,7 +71,6 @@ struct ntvattr {
 #define va_a_iroot	va_d.iroot
 #define va_a_ialloc	va_d.ialloc
 
-#ifndef __OpenBSD__
 int ntfs_procfixups( struct ntfsmount *, u_int32_t, caddr_t, size_t );
 int ntfs_parserun( cn_t *, cn_t *, u_int8_t *, u_long, u_long *);
 int ntfs_runtocn( cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t);
@@ -81,63 +80,29 @@ int ntfs_readattr( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t
 int ntfs_filesize( struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *);
 int ntfs_times( struct ntfsmount *, struct ntnode *, ntfs_times_t *);
 struct timespec	ntfs_nttimetounix( u_int64_t );
-int ntfs_ntreaddir( struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **);
 int ntfs_runtovrun( cn_t **, cn_t **, u_long *, u_int8_t *);
 int ntfs_attrtontvattr( struct ntfsmount *, struct ntvattr **, struct attr * );
 void ntfs_freentvattr( struct ntvattr * );
 int ntfs_loadntvattrs( struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **);
 struct ntvattr * ntfs_findntvattr( struct ntfsmount *, struct ntnode *, u_int32_t, cn_t );
-int ntfs_ntlookupfile(struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **);
 int ntfs_isnamepermitted(struct ntfsmount *, struct attr_indexentry * );
 int ntfs_ntvattrrele(struct ntvattr * );
 int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **);
-int ntfs_ntlookup(struct ntfsmount *, ino_t, struct ntnode **);
-int ntfs_ntget(struct ntnode *);
 void ntfs_ntref(struct ntnode *);
 void ntfs_ntrele(struct ntnode *);
-void ntfs_ntput(struct ntnode *);
 int ntfs_loadntnode( struct ntfsmount *, struct ntnode * );
 int ntfs_writentvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *);
 int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *);
 void ntfs_toupper_init(void);
-int ntfs_toupper_use(struct mount *, struct ntfsmount *);
-void ntfs_toupper_unuse(void);
 int ntfs_fget(struct ntfsmount *, struct ntnode *, int, char *, struct fnode **);
 void ntfs_frele(struct fnode *);
-#else
-int ntfs_procfixups(struct ntfsmount *, u_int32_t, caddr_t, size_t);
-int ntfs_parserun(cn_t *, cn_t *, u_int8_t *, u_long, u_long *);
-int ntfs_runtocn(cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t);
-int ntfs_readntvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *);
-int ntfs_readattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *);
-int ntfs_readattr(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *);
-int ntfs_filesize(struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *);
-int ntfs_times(struct ntfsmount *, struct ntnode *, ntfs_times_t *);
-struct timespec	ntfs_nttimetounix(u_int64_t);
 int ntfs_ntreaddir(struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **, struct proc *);
-int ntfs_runtovrun(cn_t **, cn_t **, u_long *, u_int8_t *);
-int ntfs_attrtontvattr(struct ntfsmount *, struct ntvattr **, struct attr *);
-void ntfs_freentvattr(struct ntvattr *);
-int ntfs_loadntvattrs(struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **);
-struct ntvattr * ntfs_findntvattr(struct ntfsmount *, struct ntnode *, u_int32_t, cn_t);
 int ntfs_ntlookupfile(struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **, struct proc *);
-int ntfs_isnamepermitted(struct ntfsmount *, struct attr_indexentry *);
-int ntfs_ntvattrrele(struct ntvattr * );
-int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **);
 int ntfs_ntlookup(struct ntfsmount *, ino_t, struct ntnode **, struct proc *);
 int ntfs_ntget(struct ntnode *, struct proc *);
-void ntfs_ntref(struct ntnode *);
-void ntfs_ntrele(struct ntnode *);
 void ntfs_ntput(struct ntnode *, struct proc *);
-int ntfs_loadntnode( struct ntfsmount *, struct ntnode *);
-int ntfs_writentvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *);
-int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *);
-void ntfs_toupper_init(void);
 int ntfs_toupper_use(struct mount *, struct ntfsmount *, struct proc *);
 void ntfs_toupper_unuse(struct proc *);
-int ntfs_fget(struct ntfsmount *, struct ntnode *, int, char *, struct fnode **);
-void ntfs_frele(struct fnode *);
-#endif
 
 /* ntfs_conv.c stuff */
 ntfs_wget_func_t ntfs_utf8_wget;
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 93c95061b4b..0edb1b57c96 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vfsops.c,v 1.14 2009/07/09 22:29:56 thib Exp $	*/
+/*	$OpenBSD: ntfs_vfsops.c,v 1.15 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -97,23 +97,6 @@ static int	ntfs_mountfs(struct vnode *, struct mount *,
 				  struct ntfs_args *, struct proc *);
 static int	ntfs_vptofh(struct vnode *, struct fid *);
 
-#if defined(__FreeBSD__)
-static int	ntfs_init(struct vfsconf *);
-static int	ntfs_fhtovp(struct mount *, struct fid *,
-				 struct sockaddr *, struct vnode **,
-				 int *, struct ucred **);
-#elif defined(__NetBSD__)
-static void	ntfs_init(void);
-static void	ntfs_reinit(void);
-static void	ntfs_done(void);
-static int	ntfs_fhtovp(struct mount *, struct fid *,
-				 struct vnode **);
-static int	ntfs_checkexp(struct mount *, struct mbuf *,
-				   int *, struct ucred **);
-static int	ntfs_mountroot(void);
-static int	ntfs_sysctl(int *, u_int, void *, size_t *, void *,
-				 size_t, struct proc *);
-#elif defined(__OpenBSD__)
 static int	ntfs_init(struct vfsconf *);
 static int	ntfs_fhtovp(struct mount *, struct fid *,
    			     struct vnode **);
@@ -121,22 +104,7 @@ static int	ntfs_checkexp(struct mount *, struct mbuf *,
 			       int *, struct ucred **);
 static int	ntfs_sysctl(int *, u_int, void *, size_t *, void *,
  			     size_t, struct proc *);
-#else
-static int	ntfs_init(void);
-static int	ntfs_fhtovp(struct mount *, struct fid *,
-				 struct mbuf *, struct vnode **,
-				 int *, struct ucred **);
-#endif
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-struct genfs_ops ntfs_genfsops = {
-	NULL,
-	NULL,
-	genfs_compat_gop_write,
-};
-#endif
 
-#if defined(__NetBSD__) || defined(__OpenBSD__)
 /*
  * Verify a remote client has export rights and return these rights via.
  * exflagsp and credanonp.
@@ -177,94 +145,6 @@ ntfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 	return (EINVAL);
 }
 
-#endif
-
-#ifdef __NetBSD__
-static int
-ntfs_mountroot()
-{
-	struct mount *mp;
-	struct proc *p = curproc;	/* XXX */
-	int error;
-	struct ntfs_args args;
-
-	if (root_device->dv_class != DV_DISK)
-		return (ENODEV);
-
-	/*
-	 * Get vnodes for rootdev.
-	 */
-	if (bdevvp(rootdev, &rootvp))
-		panic("ntfs_mountroot: can't setup rootvp");
-
-	if ((error = vfs_rootmountalloc(MOUNT_NTFS, "root_device", &mp))) {
-		vrele(rootvp);
-		return (error);
-	}
-
-	args.flag = 0;
-	args.uid = 0;
-	args.gid = 0;
-	args.mode = 0777;
-
-	if ((error = ntfs_mountfs(rootvp, mp, &args, p)) != 0) {
-		mp->mnt_op->vfs_refcount--;
-		vfs_unbusy(mp);
-		free(mp, M_MOUNT);
-		vrele(rootvp);
-		return (error);
-	}
-
-	CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
-	(void)ntfs_statfs(mp, &mp->mnt_stat, p);
-	vfs_unbusy(mp);
-
-	return (0);
-}
-
-static void
-ntfs_init()
-{
-#ifdef _LKM
-	malloc_type_attach(M_NTFSMNT);
-	malloc_type_attach(M_NTFSNTNODE);
-	malloc_type_attach(M_NTFSFNODE);
-	malloc_type_attach(M_NTFSDIR);
-	malloc_type_attach(M_NTFSNTHASH);
-	malloc_type_attach(M_NTFSNTVATTR);
-	malloc_type_attach(M_NTFSRDATA);
-	malloc_type_attach(M_NTFSDECOMP);
-	malloc_type_attach(M_NTFSRUN);
-#endif
-	ntfs_nthashinit();
-	ntfs_toupper_init();
-}
-
-static void
-ntfs_reinit()
-{
-	ntfs_nthashreinit();
-}
-
-static void
-ntfs_done()
-{
-	ntfs_nthashdone();
-#ifdef _LKM
-	malloc_type_detach(M_NTFSMNT);
-	malloc_type_detach(M_NTFSNTNODE);
-	malloc_type_detach(M_NTFSFNODE);
-	malloc_type_detach(M_NTFSDIR);
-	malloc_type_detach(M_NTFSNTHASH);
-	malloc_type_detach(M_NTFSNTVATTR);
-	malloc_type_detach(M_NTFSRDATA);
-	malloc_type_detach(M_NTFSDECOMP);
-	malloc_type_detach(M_NTFSRUN);
-#endif
-}
-
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-
 static int
 ntfs_init (
 	struct vfsconf *vcp )
@@ -274,18 +154,11 @@ ntfs_init (
 	return 0;
 }
 
-#endif /* NetBSD */
-
 static int
 ntfs_mount( 
 	struct mount *mp,
-#if defined(__FreeBSD__)
-	char *path,
-	caddr_t data,
-#else
 	const char *path,
 	void *data,
-#endif
 	struct nameidata *ndp,
 	struct proc *p )
 {
@@ -295,54 +168,6 @@ ntfs_mount(
 	size_t size;
 	mode_t amode;
 
-#ifdef __FreeBSD__
-	/*
-	 * Use NULL path to flag a root mount
-	 */
-	if( path == NULL) {
-		/*
-		 ***
-		 * Mounting root file system
-		 ***
-		 */
-	
-		/* Get vnode for root device*/
-		if( bdevvp( rootdev, &rootvp))
-			panic("ffs_mountroot: can't setup bdevvp for root");
-
-		/*
-		 * FS specific handling
-		 */
-		mp->mnt_flag |= MNT_RDONLY;	/* XXX globally applicable?*/
-
-		/*
-		 * Attempt mount
-		 */
-		if( ( err = ntfs_mountfs(rootvp, mp, &args, p)) != 0) {
-			/* fs specific cleanup (if any)*/
-			goto error_1;
-		}
-
-		goto dostatfs;		/* success*/
-
-	}
-#endif /* FreeBSD */
-
-#ifdef __NetBSD__
-	if (mp->mnt_flag & MNT_GETARGS) {
-		struct ntfsmount *ntmp = VFSTONTFS(mp);
-		if (ntmp == NULL)
-			return EIO;
-		args.fspec = NULL;
-		args.uid = ntmp->ntm_uid;
-		args.gid = ntmp->ntm_gid;
-		args.mode = ntmp->ntm_mode;
-		args.flag = ntmp->ntm_flag;
-		vfs_showexport(mp, &args.export, &ntmp->ntm_export);
-		return copyout(&args, data, sizeof(args));
-	}
-#endif
-
 	/*
 	 ***
 	 * Mounting non-root file system or updating a file system
@@ -393,13 +218,7 @@ ntfs_mount(
 		goto error_2;
 	}
 
-#ifdef __FreeBSD__
-	if (bdevsw(devvp->v_rdev) == NULL) {
-#elif defined(__NetBSD__)
-	if (bdevsw_lookup(devvp->v_rdev) == NULL) {
-#else
 	if (major(devvp->v_rdev) >= nblkdev) {
-#endif
 		err = ENXIO;
 		goto error_2;
 	}
@@ -451,10 +270,6 @@ ntfs_mount(
 		 * upper level code.
 		 */
 		/* Save "last mounted on" info for mount point (NULL pad)*/
-#if defined(__FreeBSD__) || defined(__NetBSD__) 
-		err = set_statfs_info(path, UIO_USERSPACE, args.fspec,
-		    UIO_USERSPACE, mp, p);
-#else
 		(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1,
 		           &size);
 		bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
@@ -462,7 +277,6 @@ ntfs_mount(
 		           MNAMELEN - 1, &size);
 		bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
 		bcopy(&args, &mp->mnt_stat.mount_info.ntfs_args, sizeof(args));
-#endif
 		if ( !err) {
 			err = ntfs_mountfs(devvp, mp, &args, p);
 		}
@@ -471,9 +285,6 @@ ntfs_mount(
 		goto error_2;
 	}
 
-#ifdef __FreeBSD__
-dostatfs:
-#endif
 	/*
 	 * Initialize FS stat information in mount struct; uses both
 	 * mp->mnt_stat.f_mntonname and mp->mnt_stat.f_mntfromname
@@ -569,11 +380,7 @@ ntfs_mountfs(devvp, mp, argsp, p)
 	ntmp->ntm_gid = argsp->gid;
 	ntmp->ntm_mode = argsp->mode;
 	ntmp->ntm_flag = argsp->flag;
-#ifdef __OpenBSD__
 	mp->mnt_data = (qaddr_t) ntmp;
-#else
-	mp->mnt_data = ntmp;
-#endif
 
 	/* set file name encode/decode hooks XXX utf-8 only for now */
 	ntmp->ntm_wget = ntfs_utf8_wget;
@@ -603,11 +410,7 @@ ntfs_mountfs(devvp, mp, argsp, p)
 
 	/* read the Unicode lowercase --> uppercase translation table,
 	 * if necessary */
-#ifndef __OpenBSD__
-	if ((error = ntfs_toupper_use(mp, ntmp)))
-#else
 	if ((error = ntfs_toupper_use(mp, ntmp, p)))
-#endif
 		goto out1;
 
 	/*
@@ -668,13 +471,8 @@ ntfs_mountfs(devvp, mp, argsp, p)
 		vput(vp);
 	}
 
-#if defined(__FreeBSD__)
-	mp->mnt_stat.f_fsid.val[0] = dev2udev(dev);
-	mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
-#else
 	mp->mnt_stat.f_fsid.val[0] = dev;
 	mp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_NTFS);
-#endif
 	mp->mnt_maxsymlinklen = 0;
 	mp->mnt_flag |= MNT_LOCAL;
 	devvp->v_specmountpoint = mp;
@@ -766,11 +564,7 @@ ntfs_unmount(
 	vinvalbuf(ntmp->ntm_devvp, V_SAVE, NOCRED, p, 0, 0);
 
 	/* lock the device vnode before calling VOP_CLOSE() */
-#ifndef __OpenBSD__
-	VOP_LOCK(ntmp->ntm_devvp, LK_EXCLUSIVE | LK_RETRY);
-#else
 	VOP_LOCK(ntmp->ntm_devvp, LK_EXCLUSIVE | LK_RETRY, p);
-#endif
 	error = VOP_CLOSE(ntmp->ntm_devvp, ronly ? FREAD : FREAD|FWRITE,
 		NOCRED, p);
 	VOP__UNLOCK(ntmp->ntm_devvp, 0, p);
@@ -778,11 +572,7 @@ ntfs_unmount(
 	vrele(ntmp->ntm_devvp);
 
 	/* free the toupper table, if this has been last mounted ntfs volume */
-#ifndef __OpenBSD__
-	ntfs_toupper_unuse();
-#else
 	ntfs_toupper_unuse(p);
-#endif
 
 	dprintf(("ntfs_umount: freeing memory...\n"));
 	mp->mnt_data = NULL;
@@ -873,13 +663,6 @@ ntfs_statfs(
 
 	mftallocated = VTOF(ntmp->ntm_sysvn[NTFS_MFTINO])->f_allocated;
 
-#if defined(__FreeBSD__)
-	sbp->f_type = mp->mnt_vfc->vfc_typenum;
-#elif defined(__NetBSD__)
-	sbp->f_type = 0;
-#elif !defined(__OpenBSD__)
-	sbp->f_type = MOUNT_NTFS;
-#endif
 	sbp->f_bsize = ntmp->ntm_bps;
 	sbp->f_iosize = ntmp->ntm_bps * ntmp->ntm_spc;
 	sbp->f_blocks = ntmp->ntm_bootfile.bf_spv;
@@ -888,9 +671,6 @@ ntfs_statfs(
 	sbp->f_files = mftallocated / ntfs_bntob(ntmp->ntm_bpmftrec) +
 		       sbp->f_ffree;
 	sbp->f_flags = mp->mnt_flag;
-#if !defined(__OpenBSD__)
-	copy_statfs_info(sbp, mp);
-#else
 	if (sbp != &mp->mnt_stat) {
 		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
 		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
@@ -898,7 +678,7 @@ ntfs_statfs(
 		    &sbp->mount_info.msdosfs_args, sizeof(struct msdosfs_args));
 	}
 	strncpy(sbp->f_fstypename, mp->mnt_vfc->vfc_name, MFSNAMELEN);
-#endif
+
 	return (0);
 }
 
@@ -916,25 +696,9 @@ ntfs_sync (
 /*ARGSUSED*/
 static int
 ntfs_fhtovp(
-#if defined(__FreeBSD__)
-	struct mount *mp,
-	struct fid *fhp,
-	struct sockaddr *nam,
-	struct vnode **vpp,
-	int *exflagsp,
-	struct ucred **credanonp)
-#elif defined(__NetBSD__) || defined(__OpenBSD__)
 	struct mount *mp,
 	struct fid *fhp,
 	struct vnode **vpp)
-#else
-	struct mount *mp,
-	struct fid *fhp,
-	struct mbuf *nam,
-	struct vnode **vpp,
-	int *exflagsp,
-	struct ucred **credanonp)
-#endif
 {
 	struct ntfid *ntfhp = (struct ntfid *)fhp;
 	int error;
@@ -1004,11 +768,7 @@ ntfs_vgetex(
 	*vpp = NULL;
 
 	/* Get ntnode */
-#ifndef __OpenBSD__
-	error = ntfs_ntlookup(ntmp, ino, &ip);
-#else
 	error = ntfs_ntlookup(ntmp, ino, &ip, p);
-#endif
 	if (error) {
 		printf("ntfs_vget: ntfs_ntget failed\n");
 		return (error);
@@ -1020,11 +780,8 @@ ntfs_vgetex(
 		if(error) {
 			printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO: %d\n",
 			       ip->i_number);
-#ifndef __OpenBSD__
-			ntfs_ntput(ip);
-#else
 			ntfs_ntput(ip, p);
-#endif
+
 			return (error);
 		}
 	}
@@ -1032,11 +789,8 @@ ntfs_vgetex(
 	error = ntfs_fget(ntmp, ip, attrtype, attrname, &fp);
 	if (error) {
 		printf("ntfs_vget: ntfs_fget failed\n");
-#ifndef __OpenBSD__
-		ntfs_ntput(ip);
-#else
 		ntfs_ntput(ip, p);
-#endif
+
 		return (error);
 	}
 
@@ -1053,11 +807,8 @@ ntfs_vgetex(
 			error = ntfs_filesize(ntmp, fp, 
 					      &fp->f_size, &fp->f_allocated);
 			if (error) {
-#ifndef __OpenBSD__
-				ntfs_ntput(ip);
-#else
 				ntfs_ntput(ip, p);
-#endif
+
 				return (error);
 			}
 		}
@@ -1072,11 +823,7 @@ ntfs_vgetex(
 	 * ntfs_fget() bumped ntnode usecount, so ntnode won't be recycled
 	 * prematurely.
 	 */
-#ifndef __OpenBSD__
-	ntfs_ntput(ip);
-#else
 	ntfs_ntput(ip, p);
-#endif
 
 	if (FTOV(fp)) {
 		/* vget() returns error if the vnode has been recycled */
@@ -1089,18 +836,12 @@ ntfs_vgetex(
 	error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, ntfs_vnodeop_p, &vp);
 	if(error) {
 		ntfs_frele(fp);
-#ifndef __OpenBSD__
-		ntfs_ntput(ip);
-#else
 		ntfs_ntput(ip, p);
-#endif
+
 		return (error);
 	}
 	dprintf(("ntfs_vget: vnode: %p for ntnode: %d\n", vp,ino));
 
-#ifdef __FreeBSD__
-	lockinit(&fp->f_lock, PINOD, "fnode", 0, 0);
-#endif
 	fp->f_vp = vp;
 	vp->v_data = fp;
 	vp->v_type = f_type;
@@ -1116,9 +857,6 @@ ntfs_vgetex(
 		}
 	}
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-	genfs_node_init(vp, &ntfs_genfsops);
-#endif
 	*vpp = vp;
 	return (0);
 }
@@ -1133,51 +871,6 @@ ntfs_vget(
 			LK_EXCLUSIVE | LK_RETRY, 0, curproc, vpp); /* XXX */
 }
 
-#if defined(__FreeBSD__)
-static struct vfsops ntfs_vfsops = {
-	ntfs_mount,
-	ntfs_start,
-	ntfs_unmount,
-	ntfs_root,
-	ntfs_quotactl,
-	ntfs_statfs,
-	ntfs_sync,
-	ntfs_vget,
-	ntfs_fhtovp,
-	ntfs_vptofh,
-	ntfs_init,
-	NULL
-};
-VFS_SET(ntfs_vfsops, ntfs, 0);
-#elif defined(__NetBSD__)
-extern const struct vnodeopv_desc ntfs_vnodeop_opv_desc;
-
-const struct vnodeopv_desc * const ntfs_vnodeopv_descs[] = {
-	&ntfs_vnodeop_opv_desc,
-	NULL,
-};
-
-struct vfsops ntfs_vfsops = {
-	MOUNT_NTFS,
-	ntfs_mount,
-	ntfs_start,
-	ntfs_unmount,
-	ntfs_root,
-	ntfs_quotactl,
-	ntfs_statfs,
-	ntfs_sync,
-	ntfs_vget,
-	ntfs_fhtovp,
-	ntfs_vptofh,
-	ntfs_init,
-	ntfs_reinit,
-	ntfs_done,
-	ntfs_sysctl,
-	ntfs_mountroot,
-	ntfs_checkexp,
-	ntfs_vnodeopv_descs,
-};
-#elif defined(__OpenBSD__)
 extern const struct vnodeopv_desc ntfs_vnodeop_opv_desc;
 
 const struct vnodeopv_desc * const ntfs_vnodeopv_descs[] = {
@@ -1200,5 +893,3 @@ const struct vfsops ntfs_vfsops = {
 	ntfs_sysctl,
 	ntfs_checkexp,
 };
-
-#endif
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index 51b644f098c..8ca8d9e498c 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vnops.c,v 1.15 2009/07/09 22:29:56 thib Exp $	*/
+/*	$OpenBSD: ntfs_vnops.c,v 1.16 2009/08/13 16:00:53 jasper Exp $	*/
 /*	$NetBSD: ntfs_vnops.c,v 1.6 2003/04/10 21:57:26 jdolecek Exp $	*/
 
 /*
@@ -48,28 +48,13 @@
 #include <sys/buf.h>
 #include <sys/dirent.h>
 
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-#include <vm/vm.h>
-#endif
-
-#if defined(__FreeBSD__)
-#include <vm/vnode_pager.h>
-#endif
-
 #include <sys/sysctl.h>
 
 
 /*#define NTFS_DEBUG 1*/
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <fs/ntfs/ntfs.h>
-#include <fs/ntfs/ntfs_inode.h>
-#include <fs/ntfs/ntfs_subr.h>
-#include <miscfs/genfs/genfs.h>
-#else
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_inode.h>
 #include <ntfs/ntfs_subr.h>
-#endif
 
 #include <miscfs/specfs/specdev.h>
 
@@ -89,35 +74,11 @@ static int	ntfs_close(struct vop_close_args *ap);
 static int	ntfs_readdir(struct vop_readdir_args *ap);
 static int	ntfs_lookup(struct vop_lookup_args *ap);
 static int	ntfs_bmap(struct vop_bmap_args *ap);
-#if defined(__FreeBSD__)
-static int	ntfs_getpages(struct vop_getpages_args *ap);
-static int	ntfs_putpages(struct vop_putpages_args *);
-#endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
 static int	ntfs_fsync(struct vop_fsync_args *ap);
-#endif
 static int	ntfs_pathconf(void *);
 
 int	ntfs_prtactive = 1;	/* 1 => print out reclaim of active vnodes */
 
-#if defined(__FreeBSD__)
-int
-ntfs_getpages(ap)
-	struct vop_getpages_args *ap;
-{
-	return vnode_pager_generic_getpages(ap->a_vp, ap->a_m, ap->a_count,
-		ap->a_reqpage);
-}
-
-int
-ntfs_putpages(ap)
-	struct vop_putpages_args *ap;
-{
-	return vnode_pager_generic_putpages(ap->a_vp, ap->a_m, ap->a_count,
-		ap->a_sync, ap->a_rtvals);
-}
-#endif
-
 /*
  * This is a noop, simply returning what one has been given.
  */
@@ -132,10 +93,6 @@ ntfs_bmap(ap)
 		*ap->a_bnp = ap->a_bn;
 	if (ap->a_runp != NULL)
 		*ap->a_runp = 0;
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-	if (ap->a_runb != NULL)
-		*ap->a_runb = 0;
-#endif
 	return (0);
 }
 
@@ -197,11 +154,7 @@ ntfs_getattr(ap)
 
 	dprintf(("ntfs_getattr: %d, flags: %d\n",ip->i_number,ip->i_flag));
 
-#if defined(__FreeBSD__)
-	vap->va_fsid = dev2udev(ip->i_dev);
-#else /* NetBSD */
 	vap->va_fsid = ip->i_dev;
-#endif
 	vap->va_fileid = ip->i_number;
 	vap->va_mode = ip->i_mp->ntm_mode;
 	vap->va_nlink = ip->i_nlink;
@@ -230,9 +183,7 @@ ntfs_inactive(ap)
 	struct vop_inactive_args *ap;
 {
 	struct vnode *vp = ap->a_vp;
-#ifdef __OpenBSD__
 	struct proc *p = ap->a_p;
-#endif
 #ifdef NTFS_DEBUG
 	struct ntnode *ip = VTONT(vp);
 #endif
@@ -262,9 +213,7 @@ ntfs_reclaim(ap)
 	struct vnode *vp = ap->a_vp;
 	struct fnode *fp = VTOF(vp);
 	struct ntnode *ip = FTONT(fp);
-#ifdef __OpenBSD__
 	struct proc *p = ap->a_p;
-#endif
 	int error;
 
 	dprintf(("ntfs_reclaim: vnode: %p, ntnode: %d\n", vp, ip->i_number));
@@ -274,22 +223,15 @@ ntfs_reclaim(ap)
 		vprint("ntfs_reclaim: pushing active", vp);
 #endif
 
-#ifndef __OpenBSD__
-	if ((error = ntfs_ntget(ip)) != 0)
-#else
 	if ((error = ntfs_ntget(ip, p)) != 0)
-#endif
 		return (error);
 	
 	/* Purge old data structures associated with the inode. */
 	cache_purge(vp);
 
 	ntfs_frele(fp);
-#ifndef __OpenBSD__
-	ntfs_ntput(ip);
-#else
 	ntfs_ntput(ip, p);
-#endif
+
 	vp->v_data = NULL;
 
 	return (0);
@@ -322,15 +264,9 @@ ntfs_strategy(ap)
 	struct ntfsmount *ntmp = ip->i_mp;
 	int error, s;
 
-#ifdef __FreeBSD__
-	dprintf(("ntfs_strategy: offset: %d, blkno: %d, lblkno: %d\n",
-		(u_int32_t)bp->b_offset,(u_int32_t)bp->b_blkno,
-		(u_int32_t)bp->b_lblkno));
-#else
 	dprintf(("ntfs_strategy: blkno: %d, lblkno: %d\n",
 		(u_int32_t)bp->b_blkno,
 		(u_int32_t)bp->b_lblkno));
-#endif
 
 	dprintf(("strategy: bcount: %u flags: 0x%x\n", 
 		(u_int32_t)bp->b_bcount,bp->b_flags));
@@ -597,11 +533,7 @@ ntfs_readdir(ap)
 		size_t remains;
 		int sz;
 
-#ifndef __OpenBSD__
-		error = ntfs_ntreaddir(ntmp, fp, num, &iep);
-#else
 		error = ntfs_ntreaddir(ntmp, fp, num, &iep, uio->uio_procp);
-#endif
 		if (error)
 			goto out;
 
@@ -649,13 +581,8 @@ ntfs_readdir(ap)
 	if (!error && ap->a_ncookies != NULL) {
 		struct dirent* dpStart;
 		struct dirent* dp;
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
 		u_long *cookies;
 		u_long *cookiep;
-#else /* defined(__NetBSD__) */
-		off_t *cookies;
-		off_t *cookiep;
-#endif
 
 		dprintf(("ntfs_readdir: %d cookies\n",ncookies));
 		if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iovcnt != 1)
@@ -663,12 +590,7 @@ ntfs_readdir(ap)
 		dpStart = (struct dirent *)
 		     ((caddr_t)uio->uio_iov->iov_base -
 			 (uio->uio_offset - off));
-#if defined(__FreeBSD__)
-		MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
-		       M_TEMP, M_WAITOK);
-#else /* defined(__NetBSD__) */
 		cookies = malloc(ncookies * sizeof(off_t), M_TEMP, M_WAITOK);
-#endif
 		for (dp = dpStart, cookiep = cookies, i=0;
 		     i < ncookies;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen), i++) {
@@ -698,9 +620,7 @@ ntfs_lookup(ap)
 	struct ucred *cred = cnp->cn_cred;
 	int error;
 	int lockparent = cnp->cn_flags & LOCKPARENT;
-#ifdef __OpenBSD__
 	struct proc *p = cnp->cn_proc;
-#endif
 #if NTFS_DEBUG
 	int wantparent = cnp->cn_flags & (LOCKPARENT|WANTPARENT);
 #endif
@@ -717,7 +637,6 @@ ntfs_lookup(ap)
 	    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
 		return (EROFS);
 
-#if defined(__NetBSD__) || defined(__OpenBSD__)
 	/*
 	 * We now have a segment name to search for, and a directory
 	 * to search.
@@ -728,7 +647,6 @@ ntfs_lookup(ap)
 	 */
 	if ((error = cache_lookup(ap->a_dvp, ap->a_vpp, cnp)) >= 0)
 		return (error);
-#endif
 
 	if(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
 		dprintf(("ntfs_lookup: faking . directory in %d\n",
@@ -770,11 +688,7 @@ ntfs_lookup(ap)
 			cnp->cn_flags &= ~PDIRUNLOCK;
 		}
 	} else {
-#ifndef __OpenBSD__
-		error = ntfs_ntlookupfile(ntmp, dvp, cnp, ap->a_vpp);
-#else
 		error = ntfs_ntlookupfile(ntmp, dvp, cnp, ap->a_vpp, p);
-#endif
 		if (error) {
 			dprintf(("ntfs_ntlookupfile: returned %d\n", error));
 			return (error);
@@ -795,7 +709,6 @@ ntfs_lookup(ap)
 	return (error);
 }
 
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
 /*
  * Flush the blocks of a file to disk.
  *
@@ -808,7 +721,6 @@ ntfs_fsync(ap)
 {
 	return (0);
 }
-#endif
 
 /*
  * Return POSIX pathconf information applicable to NTFS filesystem
@@ -835,14 +747,6 @@ ntfs_pathconf(v)
 	case _PC_NO_TRUNC:
 		*ap->a_retval = 0;
 		return (0);
-#ifdef __NetBSD__
-	case _PC_SYNC_IO:
-		*ap->a_retval = 1;
-		return (0);
-	case _PC_FILESIZEBITS:
-		*ap->a_retval = 64;
-		return (0);
-#endif
 	default:
 		return (EINVAL);
 	}
@@ -853,47 +757,6 @@ ntfs_pathconf(v)
  * Global vfs data structures
  */
 vop_t **ntfs_vnodeop_p;
-#if defined(__FreeBSD__)
-static
-struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)ntfs_bypass },
-
-	{ &vop_getattr_desc, (vop_t *)ntfs_getattr },
-	{ &vop_inactive_desc, (vop_t *)ntfs_inactive },
-	{ &vop_reclaim_desc, (vop_t *)ntfs_reclaim },
-	{ &vop_print_desc, (vop_t *)ntfs_print },
-	{ &vop_pathconf_desc, ntfs_pathconf },
-
-	{ &vop_islocked_desc, (vop_t *)vop_stdislocked },
-	{ &vop_unlock_desc, (vop_t *)vop_stdunlock },
-	{ &vop_lock_desc, (vop_t *)vop_stdlock },
-	{ &vop_cachedlookup_desc, (vop_t *)ntfs_lookup },
-	{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },
-
-	{ &vop_access_desc, (vop_t *)ntfs_access },
-	{ &vop_close_desc, (vop_t *)ntfs_close },
-	{ &vop_open_desc, (vop_t *)ntfs_open },
-	{ &vop_readdir_desc, (vop_t *)ntfs_readdir },
-	{ &vop_fsync_desc, (vop_t *)ntfs_fsync },
-
-	{ &vop_bmap_desc, (vop_t *)ntfs_bmap },
-	{ &vop_getpages_desc, (vop_t *) ntfs_getpages },
-	{ &vop_putpages_desc, (vop_t *) ntfs_putpages },
-	{ &vop_strategy_desc, (vop_t *)ntfs_strategy },
-	{ &vop_bwrite_desc, (vop_t *)vop_stdbwrite },
-	{ &vop_read_desc, (vop_t *)ntfs_read },
-	{ &vop_write_desc, (vop_t *)ntfs_write },
-
-	{ NULL, NULL }
-};
-
-static
-struct vnodeopv_desc ntfs_vnodeop_opv_desc =
-	{ &ntfs_vnodeop_p, ntfs_vnodeop_entries };
-
-VNODEOP_SET(ntfs_vnodeop_opv_desc);
-
-#elif defined(__OpenBSD__)
 static
 struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)ntfs_bypass },
@@ -926,61 +789,3 @@ struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
 
 const struct vnodeopv_desc ntfs_vnodeop_opv_desc =
 	{ &ntfs_vnodeop_p, ntfs_vnodeop_entries };
-
-#else /* !FreeBSD && !OpenBSD*/
-
-const struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *) ntfs_bypass },
-	{ &vop_lookup_desc, (vop_t *) ntfs_lookup },	/* lookup */
-	{ &vop_create_desc, genfs_eopnotsupp },		/* create */
-	{ &vop_mknod_desc, genfs_eopnotsupp },		/* mknod */
-	{ &vop_open_desc, (vop_t *) ntfs_open },	/* open */
-	{ &vop_close_desc,(vop_t *)  ntfs_close },	/* close */
-	{ &vop_access_desc, (vop_t *) ntfs_access },	/* access */
-	{ &vop_getattr_desc, (vop_t *) ntfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, genfs_eopnotsupp },	/* setattr */
-	{ &vop_read_desc, (vop_t *) ntfs_read },	/* read */
-	{ &vop_write_desc, (vop_t *) ntfs_write },	/* write */
-	{ &vop_lease_desc, genfs_lease_check },		/* lease */
-	{ &vop_fcntl_desc, genfs_fcntl },		/* fcntl */
-	{ &vop_ioctl_desc, genfs_enoioctl },		/* ioctl */
-	{ &vop_poll_desc, genfs_poll },			/* poll */
-	{ &vop_kqfilter_desc, genfs_kqfilter },		/* kqfilter */
-	{ &vop_revoke_desc, genfs_revoke },		/* revoke */
-	{ &vop_mmap_desc, genfs_mmap },			/* mmap */
-	{ &vop_fsync_desc, genfs_fsync },		/* fsync */
-	{ &vop_seek_desc, genfs_seek },			/* seek */
-	{ &vop_remove_desc, genfs_eopnotsupp },		/* remove */
-	{ &vop_link_desc, genfs_eopnotsupp },		/* link */
-	{ &vop_rename_desc, genfs_eopnotsupp },		/* rename */
-	{ &vop_mkdir_desc, genfs_eopnotsupp },		/* mkdir */
-	{ &vop_rmdir_desc, genfs_eopnotsupp },		/* rmdir */
-	{ &vop_symlink_desc, genfs_eopnotsupp },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *) ntfs_readdir },	/* readdir */
-	{ &vop_readlink_desc, genfs_eopnotsupp },	/* readlink */
-	{ &vop_abortop_desc, genfs_abortop },		/* abortop */
-	{ &vop_inactive_desc, (vop_t *) ntfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *) ntfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, genfs_lock },			/* lock */
-	{ &vop_unlock_desc, genfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, (vop_t *) ntfs_bmap },	/* bmap */
-	{ &vop_strategy_desc, (vop_t *) ntfs_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *) ntfs_print },	/* print */
-	{ &vop_islocked_desc, genfs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, ntfs_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, genfs_nullop },		/* advlock */
-	{ &vop_blkatoff_desc, genfs_eopnotsupp },	/* blkatoff */
-	{ &vop_valloc_desc, genfs_eopnotsupp },		/* valloc */
-	{ &vop_reallocblks_desc, genfs_eopnotsupp },	/* reallocblks */
-	{ &vop_vfree_desc, genfs_eopnotsupp },		/* vfree */
-	{ &vop_truncate_desc, genfs_eopnotsupp },	/* truncate */
-	{ &vop_update_desc, genfs_eopnotsupp },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },		/* bwrite */
-	{ &vop_getpages_desc, genfs_compat_getpages },	/* getpages */
-	{ &vop_putpages_desc, genfs_putpages },		/* putpages */
-	{ NULL, NULL }
-};
-const struct vnodeopv_desc ntfs_vnodeop_opv_desc =
-	{ &ntfs_vnodeop_p, ntfs_vnodeop_entries };
-
-#endif