diff --git a/sys/conf/NOTES b/sys/conf/NOTES
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2673,7 +2673,6 @@
 
 # Debug options
 options 	BUS_DEBUG	# enable newbus debugging
-options 	DEBUG_VFS_LOCKS	# enable VFS lock debugging
 options 	SOCKBUF_DEBUG	# enable sockbuf last record/mb tail checking
 options 	IFMEDIA_DEBUG	# enable debugging in net/if_media.c
 
diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -601,7 +601,6 @@
 BURN_BRIDGES		opt_global.h
 DEBUG			opt_global.h
 DEBUG_LOCKS		opt_global.h
-DEBUG_VFS_LOCKS		opt_global.h
 DFLTPHYS		opt_global.h
 DIAGNOSTIC		opt_global.h
 INVARIANT_SUPPORT	opt_global.h
diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug
--- a/sys/conf/std.nodebug
+++ b/sys/conf/std.nodebug
@@ -7,7 +7,6 @@
 nooptions	DIAGNOSTIC
 nooptions	WITNESS
 nooptions	WITNESS_SKIPSPIN
-nooptions	DEBUG_VFS_LOCKS
 nooptions	BUF_TRACKING
 nooptions	FULL_BUF_TRACKING
 nooptions	DEADLKRES
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -1071,7 +1071,7 @@
  *    forwarded VOP reacquires the base vnode lock the unionfs vnode
  *    lock will no longer be held.  This can lead to violation of the
  *    caller's sychronization requirements as well as various failed
- *    locking assertions when DEBUG_VFS_LOCKS is enabled.
+ *    locking assertions when INVARIANTS is enabled.
  * 2) Loss of reference on the base vnode.  The caller is expected to
  *    hold a v_usecount reference on the unionfs vnode, while the
  *    unionfs vnode holds a reference on the base-layer vnode(s).  But