the upper case table code was a lot more complicated than it needed to be.

1 files changed, 3 insertions, 14 deletions

diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 459d8d7a9fe..a23f681402c 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vfsops.c,v 1.19 2010/08/12 04:05:03 tedu Exp $	*/
+/*	$OpenBSD: ntfs_vfsops.c,v 1.20 2010/08/22 21:23:07 tedu Exp $	*/
 /*	$NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -68,13 +68,6 @@
 #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 *);
@@ -150,7 +143,6 @@ ntfs_init (
 	struct vfsconf *vcp )
 {
 	ntfs_nthashinit();
-	ntfs_toupper_init();
 	return 0;
 }
 
@@ -412,14 +404,14 @@ ntfs_mountfs(devvp, mp, argsp, p)
 
 	/* read the Unicode lowercase --> uppercase translation table,
 	 * if necessary */
-	if ((error = ntfs_toupper_use(mp, ntmp, p)))
+	if ((error = ntfs_load_toupper(mp, ntmp)))
 		goto out1;
 
 	/*
 	 * Scan $BitMap and count free clusters
 	 */
 	error = ntfs_calccfree(ntmp, &ntmp->ntm_cfree);
-	if(error)
+	if (error)
 		goto out1;
 
 	/*
@@ -569,9 +561,6 @@ ntfs_unmount(
 
 	vput(ntmp->ntm_devvp);
 
-	/* free the toupper table, if this has been last mounted ntfs volume */
-	ntfs_toupper_unuse(p);
-
 	dprintf(("ntfs_umount: freeing memory...\n"));
 	mp->mnt_data = NULL;
 	mp->mnt_flag &= ~MNT_LOCAL;