Page MenuHomeFreeBSD

ZFS: fix assertions with INVARIANTS
ClosedPublic

Authored by asomers on Jan 20 2021, 3:56 PM.

Details

Summary

AFAICT, this was an oversight from
9e5787d2284e187abb5b654d924394a65772e004 (svn r364746). That revision
inadvertently disabled assertions unconditionally.

Sponsored by: Axcient

Diff Detail

Repository
R10 FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ping. Is anybody able to review this change?

The asserts are working fine when building OpenZFS out of tree, so how is it that this is needed in tree?

I am concerned that this Makefile is not well maintained. It is essentially a copy of sys/contrib/openzfs/module/Makefile.bsd and I'd imagine with a little attention it could be trimmed down to a few lines and an include for that file.

The asserts are working fine when building OpenZFS out of tree, so how is it that this is needed in tree?

I am concerned that this Makefile is not well maintained. It is essentially a copy of sys/contrib/openzfs/module/Makefile.bsd and I'd imagine with a little attention it could be trimmed down to a few lines and an include for that file.

I've never tried building OpenZFS out-of-tree. For in-tree builds, nothing defines DEBUG if you don't include this file. It probably works for the out-of-tree build because if the stanza that begins

.if defined(WITH_DEBUG) && ${WITH_DEBUG} == "true"
CFLAGS+= -DZFS_DEBUG -g

which only appears in sys/contrib/openzfs/module/Makefile.bsd .

This revision is now accepted and ready to land.Mon, Feb 8, 4:24 PM
This revision was automatically updated to reflect the committed changes.