Remove code that is not used on OpenBSD.

ok miod@ krw@

3 files changed, 3 insertions, 39 deletions

diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c
index e22f1236eb5..7128b8fd1f4 100644
--- a/sys/ntfs/ntfs_ihash.c
+++ b/sys/ntfs/ntfs_ihash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_ihash.c,v 1.10 2010/09/04 21:35:58 tedu Exp $	*/
+/*	$OpenBSD: ntfs_ihash.c,v 1.11 2013/01/02 08:12:13 jsing Exp $	*/
 /*	$NetBSD: ntfs_ihash.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $	*/
 
 /*
@@ -46,10 +46,6 @@
 #include <ntfs/ntfs_inode.h>
 #include <ntfs/ntfs_ihash.h>
 
-#ifdef MALLOC_DEFINE
-MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables");
-#endif
-
 /*
  * Structures associated with inode cacheing.
  */
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index 5b6be5c820a..a5e694af740 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_subr.c,v 1.25 2011/07/04 20:35:35 deraadt Exp $	*/
+/*	$OpenBSD: ntfs_subr.c,v 1.26 2013/01/02 08:12:13 jsing Exp $	*/
 /*	$NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $	*/
 
 /*-
@@ -55,13 +55,6 @@
 int ntfs_debug = NTFS_DEBUG;
 #endif
 
-#ifdef MALLOC_DEFINE
-MALLOC_DEFINE(M_NTFSNTVATTR, "NTFS vattr", "NTFS file attribute information");
-MALLOC_DEFINE(M_NTFSRDATA, "NTFS res data", "NTFS resident data");
-MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage");
-MALLOC_DEFINE(M_NTFSDECOMP, "NTFS decomp", "NTFS decompression temporary");
-#endif
-
 /* Local struct used in ntfs_ntlookupfile() */
 struct ntfs_lookup_ctx {
 	u_int32_t	aoff;
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 86de5919f16..9a0849b5e37 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vfsops.c,v 1.29 2012/09/10 11:11:00 jsing Exp $	*/
+/*	$OpenBSD: ntfs_vfsops.c,v 1.30 2013/01/02 08:12:13 jsing Exp $	*/
 /*	$NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -45,43 +45,18 @@
 #include <sys/conf.h>
 #include <sys/specdev.h>
 
-#if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <uvm/uvm_extern.h>
-#else
-#include <vm/vm.h>
-#endif
 
 /*#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 <fs/ntfs/ntfs_vfsops.h>
-#include <fs/ntfs/ntfs_ihash.h>
-#include <fs/ntfs/ntfsmount.h>
-#else
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_inode.h>
 #include <ntfs/ntfs_subr.h>
 #include <ntfs/ntfs_vfsops.h>
 #include <ntfs/ntfs_ihash.h>
 #include <ntfs/ntfsmount.h>
-#endif
-
-#ifdef MALLOC_DEFINE
-MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure");
-MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode",  "NTFS ntnode information");
-MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode",  "NTFS fnode information");
-MALLOC_DEFINE(M_NTFSDIR,"NTFS dir",  "NTFS dir buffer");
-#endif
 
-#if defined(__FreeBSD__)
-static int	ntfs_mount(struct mount *, char *, caddr_t,
-				struct nameidata *, struct proc *);
-#else
 static int	ntfs_mount(struct mount *, const char *, void *,
 				struct nameidata *, struct proc *);
-#endif
 static int	ntfs_quotactl(struct mount *, int, uid_t, caddr_t,
 				   struct proc *);
 static int	ntfs_root(struct mount *, struct vnode **);