FreeBSD: Remove references to DEBUG_VFS_LOCKS#18136
Merged
behlendorf merged 1 commit intoopenzfs:masterfrom Jan 19, 2026
Merged
FreeBSD: Remove references to DEBUG_VFS_LOCKS#18136behlendorf merged 1 commit intoopenzfs:masterfrom
behlendorf merged 1 commit intoopenzfs:masterfrom
Conversation
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Signed-off-by: Mark Johnston <markj@FreeBSD.org>
There was a problem hiding this comment.
Pull request overview
This PR removes references to the obsolete FreeBSD DEBUG_VFS_LOCKS option, which has been superseded by the standard INVARIANTS option. The change removes conditional compilation directives while preserving the actual assertion check functionality.
Changes:
- Removed the
VNCHECKREFmacro definition that was conditionally compiled withDEBUG_VFS_LOCKS - Removed the conditional variable declaration
vnode_t *dvpthat was only used for the macro - Removed the build system configuration for
WITH_VFS_DEBUGin module/Makefile.bsd - Replaced the macro invocation with a direct
VNASSERTcall
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| module/os/freebsd/zfs/zfs_vnops_os.c | Removed DEBUG_VFS_LOCKS macro definition and conditional variable, replaced macro usage with direct VNASSERT call |
| module/Makefile.bsd | Removed build configuration for WITH_VFS_DEBUG option |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
amotin
approved these changes
Jan 15, 2026
behlendorf
approved these changes
Jan 17, 2026
amotin
pushed a commit
to amotin/zfs
that referenced
this pull request
Jan 29, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
mcmilk
pushed a commit
to mcmilk/zfs
that referenced
this pull request
Jan 31, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
amotin
pushed a commit
to amotin/zfs
that referenced
this pull request
Feb 3, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
amotin
pushed a commit
to amotin/zfs
that referenced
this pull request
Feb 3, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
lundman
pushed a commit
to openzfsonosx/openzfs-fork
that referenced
this pull request
Feb 5, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
tonyhutter
pushed a commit
that referenced
this pull request
Feb 5, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes #18136
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Feb 12, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
lundman
pushed a commit
to openzfsonwindows/openzfs
that referenced
this pull request
Feb 23, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
lundman
pushed a commit
to openzfsonwindows/openzfs
that referenced
this pull request
Feb 23, 2026
This option is removed upstream in favour of plain INVARIANTS. VNASSERT is always defined so I see no reason to use it conditionally. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Signed-off-by: Mark Johnston <markj@FreeBSD.org> Closes openzfs#18136
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation and Context
FreeBSD used to have a separate debug option for VFS invariants checking, DEBUG_VFS_LOCKS. This was removed upstream since developers (including me) often forgot to enable it. Now these checks are enabled by the standard INVARIANTS option.
Description
ZFS had a couple of references to DEBUG_VFS_LOCKS. The change removes them without removing the correpsonding check.
How Has This Been Tested?
Built with
--enable-invariantsand--disable-invariants.Types of changes
Checklist:
Signed-off-by.