git: 174a7e578a33 - main - ZFS: fix assertions with INVARIANTS

Alan Somers asomers at FreeBSD.org
Mon Feb 8 23:42:35 UTC 2021


The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=174a7e578a33c01401e33f9bfcc077fc3155251c

commit 174a7e578a33c01401e33f9bfcc077fc3155251c
Author:     Alan Somers <asomers at FreeBSD.org>
AuthorDate: 2021-01-20 15:55:36 +0000
Commit:     Alan Somers <asomers at FreeBSD.org>
CommitDate: 2021-02-08 23:41:35 +0000

    ZFS: fix assertions with INVARIANTS
    
    AFAICT, this was an oversight from
    9e5787d2284e187abb5b654d924394a65772e004 (svn r364746).  That revision
    inadvertently disabled assertions unconditionally.
    
    Reviewed by:    freqlabs
    MFC after:      3 days
    Sponsored by:   Axcient
    Differential Revision:  https://reviews.freebsd.org/D28256
---
 sys/modules/zfs/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index e4b92db764ef..49256609b549 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -282,6 +282,8 @@ SRCS+=	zfs_zstd.c \
 
 .include <bsd.kmod.mk>
 
+CFLAGS+= -include ${SRCTOP}/sys/cddl/compat/opensolaris/sys/debug_compat.h
+
 CWARNFLAGS+=	${OPENZFS_CWARNFLAGS}
 
 CFLAGS.gcc+= -Wno-pointer-to-int-cast


More information about the dev-commits-src-main mailing list