Module Name:    src
Committed By:   pgoyette
Date:           Thu Jan  6 15:08:56 UTC 2022

Modified Files:
        src/sys/modules/ffs: Makefile
        src/sys/modules/ufs: Makefile

Log Message:
Since UFS_DIRHASH is explicitly disabled in GENERIC kernels (due to
being suspected of memory corruption), it should not be enabled in
the default module configurations either.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.18 src/sys/modules/ffs/Makefile:1.19
--- src/sys/modules/ffs/Makefile:1.18	Sun Oct 18 19:56:41 2020
+++ src/sys/modules/ffs/Makefile	Thu Jan  6 15:08:56 2022
@@ -1,12 +1,13 @@
-#	$NetBSD: Makefile,v 1.18 2020/10/18 19:56:41 christos Exp $
+#	$NetBSD: Makefile,v 1.19 2022/01/06 15:08:56 pgoyette Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/ufs/ffs
 
 KMOD=	ffs
-CPPFLAGS+=      -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
+CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
 CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
+#CPPFLAGS+=	-DUFS_DIRHASH # disabled - suspected of corrupting memory
 
 CWARNFLAGS.clang=	-Wno-conversion
 COPTS.ffs_appleufs.c+=   ${NO_ADDR_OF_PACKED_MEMBER}

Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.4 src/sys/modules/ufs/Makefile:1.5
--- src/sys/modules/ufs/Makefile:1.4	Sat May 16 18:31:52 2020
+++ src/sys/modules/ufs/Makefile	Thu Jan  6 15:08:56 2022
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile,v 1.4 2020/05/16 18:31:52 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2022/01/06 15:08:56 pgoyette Exp $
 
 .include "../Makefile.inc"
 
 KMOD=	ufs
 
-CPPFLAGS+=      -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
+CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
 CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
+CPPFLAGS+=	-DUFS_DIRHASH	# disabled - suspected of corrupting memory
 
 CWARNFLAGS.clang=	-Wno-conversion
 

Reply via email to