Date: Sat, 13 Feb 2021 05:03:36 GMT From: Alan Somers <asomers@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8874f305d814 - stable/13 - ZFS: fix assertions with INVARIANTS Message-ID: <202102130503.11D53aMB071292@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=8874f305d81414e7b6ec0b3ecc2a0736389a8492 commit 8874f305d81414e7b6ec0b3ecc2a0736389a8492 Author: Alan Somers <asomers@FreeBSD.org> AuthorDate: 2021-01-20 15:55:36 +0000 Commit: Alan Somers <asomers@FreeBSD.org> CommitDate: 2021-02-13 05:03:19 +0000 ZFS: fix assertions with INVARIANTS AFAICT, this was an oversight from 9e5787d2284e187abb5b654d924394a65772e004 (svn r364746). That revision inadvertently disabled assertions unconditionally. Reviewed by: freqlabs Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D28256 (cherry picked from commit 174a7e578a33c01401e33f9bfcc077fc3155251c) --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102130503.11D53aMB071292>