move NTFS code from sys/ntfs to sys/fs/ntfs

This commit is contained in:
jdolecek 2002-12-23 17:38:19 +00:00
parent 5356de155a
commit 9accf4df15
21 changed files with 69 additions and 71 deletions

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.48 2002/12/23 17:30:37 jdolecek Exp $
# $NetBSD: Makefile,v 1.49 2002/12/23 17:38:21 jdolecek Exp $
SUBDIR= altq arch compat dev fs isofs lkm miscfs msdosfs \
net netatalk netccitt netinet netinet6 netisdn netiso netkey \
netnatm netns netsmb nfs ntfs sys ufs uvm
netnatm netns netsmb nfs sys ufs uvm
# Speedup stubs for some subtrees that don't need to run these rules
includes-lkm:

View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.584 2002/12/23 17:30:36 jdolecek Exp $
# $NetBSD: files,v 1.585 2002/12/23 17:38:19 jdolecek Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -978,7 +978,7 @@ include "miscfs/umapfs/files.umapfs"
include "miscfs/union/files.union"
include "msdosfs/files.msdosfs"
include "nfs/files.nfs"
include "ntfs/files.ntfs"
include "fs/ntfs/files.ntfs"
include "ufs/files.ufs"
#

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 2002/12/23 17:30:37 jdolecek Exp $
# $NetBSD: Makefile,v 1.4 2002/12/23 17:38:21 jdolecek Exp $
SUBDIR= adosfs filecorefs smbfs
SUBDIR= adosfs filecorefs ntfs smbfs
.include <bsd.kinc.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2002/11/26 23:30:34 lukem Exp $
# $NetBSD: Makefile,v 1.1 2002/12/23 17:38:30 jdolecek Exp $
INCSDIR= /usr/include/ntfs

View File

@ -1,4 +1,4 @@
$NetBSD: TODO,v 1.21 2001/12/16 18:29:03 jdolecek Exp $
$NetBSD: TODO,v 1.1 2002/12/23 17:38:31 jdolecek Exp $
- convert the code to do caching in buffer cache indexed by
file-vnode/file-offset so that NTFS would take advantage of UBC;
@ -10,8 +10,6 @@ $NetBSD: TODO,v 1.21 2001/12/16 18:29:03 jdolecek Exp $
- working VOP_BALLOC() (new in UBC)
(from Chuq)
- working mmap (broken with UBC?) - kern/13355
- readdir: evalutate impact of using variable length reclen - should
enable us to store much more entries into buf in typical case with
short filenames, though more work would need to be done in offset != 0

12
sys/fs/ntfs/files.ntfs Normal file
View File

@ -0,0 +1,12 @@
# $NetBSD: files.ntfs,v 1.1 2002/12/23 17:38:31 jdolecek Exp $
deffs fs_ntfs.h NTFS
defflag opt_ntfs.h NTFS_DEBUG
file fs/ntfs/ntfs_compr.c ntfs
file fs/ntfs/ntfs_conv.c ntfs
file fs/ntfs/ntfs_ihash.c ntfs
file fs/ntfs/ntfs_subr.c ntfs
file fs/ntfs/ntfs_vfsops.c ntfs
file fs/ntfs/ntfs_vnops.c ntfs

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs.h,v 1.14 2001/05/30 11:42:13 mrg Exp $ */
/* $NetBSD: ntfs.h,v 1.1 2002/12/23 17:38:31 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_compr.c,v 1.4 2001/11/10 13:24:53 lukem Exp $ */
/* $NetBSD: ntfs_compr.c,v 1.1 2002/12/23 17:38:31 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_compr.c,v 1.4 2001/11/10 13:24:53 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_compr.c,v 1.1 2002/12/23 17:38:31 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: ntfs_compr.c,v 1.4 2001/11/10 13:24:53 lukem Exp $")
#include <miscfs/specfs/specdev.h>
#include <ntfs/ntfs.h>
#include <ntfs/ntfs_compr.h>
#include <fs/ntfs/ntfs.h>
#include <fs/ntfs/ntfs_compr.h>
#define GET_UINT16(addr) (*((u_int16_t *)(addr)))

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_compr.h,v 1.3 1999/07/26 14:02:31 jdolecek Exp $ */
/* $NetBSD: ntfs_compr.h,v 1.1 2002/12/23 17:38:32 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_conv.c,v 1.3 2001/11/15 09:48:29 lukem Exp $ */
/* $NetBSD: ntfs_conv.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_conv.c,v 1.3 2001/11/15 09:48:29 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_conv.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -60,13 +60,13 @@ __KERNEL_RCSID(0, "$NetBSD: ntfs_conv.c,v 1.3 2001/11/15 09:48:29 lukem Exp $");
#include <miscfs/specfs/specdev.h>
/* #define NTFS_DEBUG 1 */
#include <ntfs/ntfs.h>
#include <ntfs/ntfsmount.h>
#include <ntfs/ntfs_inode.h>
#include <ntfs/ntfs_vfsops.h>
#include <ntfs/ntfs_subr.h>
#include <ntfs/ntfs_compr.h>
#include <ntfs/ntfs_ihash.h>
#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>
/* UTF-8 encoding stuff */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_ihash.c,v 1.8 2001/11/10 13:24:53 lukem Exp $ */
/* $NetBSD: ntfs_ihash.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993, 1995
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_ihash.c,v 1.8 2001/11/10 13:24:53 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_ihash.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: ntfs_ihash.c,v 1.8 2001/11/10 13:24:53 lukem Exp $")
#include <sys/proc.h>
#include <sys/mount.h>
#include <ntfs/ntfs.h>
#include <ntfs/ntfs_inode.h>
#include <ntfs/ntfs_ihash.h>
#include <fs/ntfs/ntfs.h>
#include <fs/ntfs/ntfs_inode.h>
#include <fs/ntfs/ntfs_ihash.h>
MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables");

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_ihash.h,v 1.7 2001/09/15 16:13:03 chs Exp $ */
/* $NetBSD: ntfs_ihash.h,v 1.1 2002/12/23 17:38:32 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_inode.h,v 1.10 2001/12/18 07:51:16 chs Exp $ */
/* $NetBSD: ntfs_inode.h,v 1.1 2002/12/23 17:38:33 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_subr.c,v 1.33 2002/09/27 15:38:01 provos Exp $ */
/* $NetBSD: ntfs_subr.c,v 1.1 2002/12/23 17:38:33 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (semenu@FreeBSD.org)
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.33 2002/09/27 15:38:01 provos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.1 2002/12/23 17:38:33 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -49,13 +49,13 @@ __KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.33 2002/09/27 15:38:01 provos Exp $"
#include <miscfs/specfs/specdev.h>
/* #define NTFS_DEBUG 1 */
#include <ntfs/ntfs.h>
#include <ntfs/ntfsmount.h>
#include <ntfs/ntfs_inode.h>
#include <ntfs/ntfs_vfsops.h>
#include <ntfs/ntfs_subr.h>
#include <ntfs/ntfs_compr.h>
#include <ntfs/ntfs_ihash.h>
#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>
#if defined(NTFS_DEBUG)
int ntfs_debug = NTFS_DEBUG;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_subr.h,v 1.9 2001/02/13 19:53:52 jdolecek Exp $ */
/* $NetBSD: ntfs_subr.h,v 1.1 2002/12/23 17:38:33 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vfsops.c,v 1.43 2002/09/21 18:13:54 christos Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.1 2002/12/23 17:38:33 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.43 2002/09/21 18:13:54 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.1 2002/12/23 17:38:33 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -54,12 +54,12 @@ __KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.43 2002/09/21 18:13:54 christos Ex
#include <miscfs/specfs/specdev.h>
/*#define NTFS_DEBUG 1*/
#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>
#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>
#if defined(__FreeBSD__)
MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure");

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vfsops.h,v 1.4 1999/10/10 14:20:33 jdolecek Exp $ */
/* $NetBSD: ntfs_vfsops.h,v 1.1 2002/12/23 17:38:34 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (semenu@FreeBSD.org)

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vnops.c,v 1.41 2002/10/23 09:14:53 jdolecek Exp $ */
/* $NetBSD: ntfs_vnops.c,v 1.1 2002/12/23 17:38:34 jdolecek Exp $ */
/*
* Copyright (c) 1992, 1993
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.41 2002/10/23 09:14:53 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.1 2002/12/23 17:38:34 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -66,9 +66,9 @@ __KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.41 2002/10/23 09:14:53 jdolecek Exp
/*#define NTFS_DEBUG 1*/
#include <ntfs/ntfs.h>
#include <ntfs/ntfs_inode.h>
#include <ntfs/ntfs_subr.h>
#include <fs/ntfs/ntfs.h>
#include <fs/ntfs/ntfs_inode.h>
#include <fs/ntfs/ntfs_subr.h>
#include <miscfs/specfs/specdev.h>
#include <miscfs/genfs/genfs.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfsmount.h,v 1.4 2002/09/21 18:13:54 christos Exp $ */
/* $NetBSD: ntfsmount.h,v 1.1 2002/12/23 17:38:34 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.4 2001/12/12 12:06:50 lukem Exp $
# $NetBSD: Makefile,v 1.5 2002/12/23 17:38:21 jdolecek Exp $
.include "../Makefile.inc"
.PATH: $S/ntfs ${.CURDIR}/..
.PATH: $S/fs/ntfs ${.CURDIR}/..
KMOD= ntfs

View File

@ -1,12 +0,0 @@
# $NetBSD: files.ntfs,v 1.1 2002/04/16 23:14:10 thorpej Exp $
deffs fs_ntfs.h NTFS
defflag opt_ntfs.h NTFS_DEBUG
file ntfs/ntfs_compr.c ntfs
file ntfs/ntfs_conv.c ntfs
file ntfs/ntfs_ihash.c ntfs
file ntfs/ntfs_subr.c ntfs
file ntfs/ntfs_vfsops.c ntfs
file ntfs/ntfs_vnops.c ntfs