From: Antonio Huete Jimenez Date: Tue, 19 Jun 2012 20:56:37 +0000 (+0200) Subject: ntfs - Add NTFS_DEBUG kernel option. X-Git-Tag: v3.2.0~756^2~9 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1b0988d063bc923a2b62a008ddf20d2fb1a0188b ntfs - Add NTFS_DEBUG kernel option. Remove also CVS IDs from the files that still have it. --- diff --git a/sys/conf/options b/sys/conf/options index 9387b4ccf5..4d2af3e225 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -601,6 +601,9 @@ KTR_TSLEEP opt_ktr.h KTR_USB_MEMORY opt_ktr.h KTR_VERBOSE opt_ktr.h +# NTFS options +NTFS_DEBUG opt_ntfs.h + # options for the Atheros driver ATH_DEBUG opt_ath.h ATH_DIAGAPI opt_ath.h diff --git a/sys/config/LINT b/sys/config/LINT index ad79a5fe49..f86e5ec1ef 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -787,6 +787,9 @@ options NFS_WDELAYHASHSIZ=16 # and with this options NFS_MUIDHASHSIZ=63 # Tune the size of nfsmount with this options NFS_DEBUG # Enable NFS Debugging +# NTFS options: +options NTFS_DEBUG + # MSDOSFS options: options MSDOSFS_DEBUG # Enable MSDOSFS Debugging diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 26b7b5aa57..a59a9a5014 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -641,6 +641,9 @@ options NFS_WDELAYHASHSIZ=16 # and with this options NFS_MUIDHASHSIZ=63 # Tune the size of nfsmount with this options NFS_DEBUG # Enable NFS Debugging +# NTFS options: +options NTFS_DEBUG + # MSDOSFS options: options MSDOSFS_DEBUG # Enable MSDOSFS Debugging diff --git a/sys/vfs/ntfs/Makefile b/sys/vfs/ntfs/Makefile index 91220b9594..a9cd16033d 100644 --- a/sys/vfs/ntfs/Makefile +++ b/sys/vfs/ntfs/Makefile @@ -1,9 +1,10 @@ # $FreeBSD: src/sys/modules/ntfs/Makefile,v 1.5 1999/12/12 20:34:07 peter Exp $ -# $DragonFly: src/sys/vfs/ntfs/Makefile,v 1.4 2004/08/13 17:51:12 dillon Exp $ KMOD= ntfs SRCS= ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \ ntfs_compr.c +SRCS+= opt_ntfs.h + SUBDIR= ntfs_iconv .include diff --git a/sys/vfs/ntfs/ntfs.h b/sys/vfs/ntfs/ntfs.h index 712d6d9d70..f90caa2f6d 100644 --- a/sys/vfs/ntfs/ntfs.h +++ b/sys/vfs/ntfs/ntfs.h @@ -28,13 +28,11 @@ * $FreeBSD: src/sys/ntfs/ntfs.h,v 1.8.2.2 2001/10/12 22:08:49 semenu Exp $ */ -/*#define NTFS_DEBUG 1*/ -#if defined(__NetBSD__) && defined(_KERNEL) && !defined(_LKM) +#ifdef _KERNEL #include "opt_ntfs.h" #endif -#if defined(__DragonFly__) #include -#endif + typedef u_int64_t cn_t; typedef u_int16_t wchar; diff --git a/sys/vfs/ntfs/ntfs_compr.c b/sys/vfs/ntfs/ntfs_compr.c index 9b3221554d..b9bab59beb 100644 --- a/sys/vfs/ntfs/ntfs_compr.c +++ b/sys/vfs/ntfs/ntfs_compr.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_compr.c,v 1.7 1999/12/03 20:37:38 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_compr.c,v 1.4 2003/08/07 21:17:42 dillon Exp $ */ #include diff --git a/sys/vfs/ntfs/ntfs_compr.h b/sys/vfs/ntfs/ntfs_compr.h index 0dcc1a9d3f..698b27c347 100644 --- a/sys/vfs/ntfs/ntfs_compr.h +++ b/sys/vfs/ntfs/ntfs_compr.h @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_compr.h,v 1.6 1999/12/03 20:37:38 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_compr.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ */ #define NTFS_COMPBLOCK_SIZE 0x1000 diff --git a/sys/vfs/ntfs/ntfs_ihash.h b/sys/vfs/ntfs/ntfs_ihash.h index a0e643fcaa..64290bcba1 100644 --- a/sys/vfs/ntfs/ntfs_ihash.h +++ b/sys/vfs/ntfs/ntfs_ihash.h @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_ihash.h,v 1.5 1999/12/03 20:37:39 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_ihash.h,v 1.5 2006/09/10 01:26:41 dillon Exp $ */ struct vfsconf; diff --git a/sys/vfs/ntfs/ntfs_inode.h b/sys/vfs/ntfs/ntfs_inode.h index 237a485f20..a7ff6ae948 100644 --- a/sys/vfs/ntfs/ntfs_inode.h +++ b/sys/vfs/ntfs/ntfs_inode.h @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_inode.h,v 1.6 1999/12/03 20:37:39 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_inode.h,v 1.7 2006/09/10 01:26:41 dillon Exp $ */ /* These flags are kept in i_flag. */ diff --git a/sys/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c index 5fbbcce4ef..e94039f50c 100644 --- a/sys/vfs/ntfs/ntfs_subr.c +++ b/sys/vfs/ntfs/ntfs_subr.c @@ -52,7 +52,6 @@ #include #endif -/* #define NTFS_DEBUG 1 */ #include "ntfs.h" #include "ntfsmount.h" #include "ntfs_inode.h" diff --git a/sys/vfs/ntfs/ntfs_subr.h b/sys/vfs/ntfs/ntfs_subr.h index 46de35f5cf..348ec24c91 100644 --- a/sys/vfs/ntfs/ntfs_subr.h +++ b/sys/vfs/ntfs/ntfs_subr.h @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_subr.h,v 1.7.2.1 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.h,v 1.3 2003/08/20 09:56:33 rob Exp $ */ #define VA_LOADED 0x0001 diff --git a/sys/vfs/ntfs/ntfs_vfsops.c b/sys/vfs/ntfs/ntfs_vfsops.c index d0195ee252..5935b85686 100644 --- a/sys/vfs/ntfs/ntfs_vfsops.c +++ b/sys/vfs/ntfs/ntfs_vfsops.c @@ -63,7 +63,6 @@ #include -/*#define NTFS_DEBUG 1*/ #include "ntfs.h" #include "ntfs_inode.h" #include "ntfs_subr.h" diff --git a/sys/vfs/ntfs/ntfs_vfsops.h b/sys/vfs/ntfs/ntfs_vfsops.h index c9d78a671e..cc6f24b475 100644 --- a/sys/vfs/ntfs/ntfs_vfsops.h +++ b/sys/vfs/ntfs/ntfs_vfsops.h @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vfsops.h,v 1.6 2000/01/14 19:54:41 bde Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.h,v 1.3 2003/06/25 03:56:07 dillon Exp $ */ #define VG_DONTLOADIN 0x0001 /* Tells ntfs_vgetex to do not call */ /* ntfs_loadntnode() on ntnode, even if */ diff --git a/sys/vfs/ntfs/ntfs_vnops.c b/sys/vfs/ntfs/ntfs_vnops.c index e63ab1b302..557d645dbb 100644 --- a/sys/vfs/ntfs/ntfs_vnops.c +++ b/sys/vfs/ntfs/ntfs_vnops.c @@ -71,7 +71,6 @@ #include -/*#define NTFS_DEBUG 1*/ #include "ntfs.h" #include "ntfs_inode.h" #include "ntfs_subr.h" diff --git a/sys/vfs/ntfs/ntfsmount.h b/sys/vfs/ntfs/ntfsmount.h index b51f89186d..f31aa1801c 100644 --- a/sys/vfs/ntfs/ntfsmount.h +++ b/sys/vfs/ntfs/ntfsmount.h @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfsmount.h,v 1.6.2.1 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfsmount.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ */ #include