git: 750ea20d3fb1 - main - Delete dead CLUSTERDEBUG config option.

[Konstantin Belousov]

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=750ea20d3fb143a95ccf3ff84cfbe86cce9b9cac

commit 750ea20d3fb143a95ccf3ff84cfbe86cce9b9cac
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-02-18 09:12:26 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-02-21 09:38:21 +0000

    Delete dead CLUSTERDEBUG config option.
    
    Reviewed by:    mckusick
    Tested by:      pho
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D28679
---
 sys/conf/NOTES         | 3 ---
 sys/conf/options       | 1 -
 sys/kern/vfs_cluster.c | 8 --------
 3 files changed, 12 deletions(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index b4202bb65618..f73b5a466366 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2732,9 +2732,6 @@ options 	NSWBUF_MIN=120
 
 options 	CAM_DEBUG_DELAY
 
-# VFS cluster debugging.
-options 	CLUSTERDEBUG
-
 options 	DEBUG
 
 # Kernel filelock debugging.
diff --git a/sys/conf/options b/sys/conf/options
index 2f324143c574..b6956193d841 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -570,7 +570,6 @@ TI_JUMBO_HDRSPLIT	opt_ti.h
 # Misc debug flags.  Most of these should probably be replaced with
 # 'DEBUG', and then let people recompile just the interesting modules
 # with 'make CC="cc -DDEBUG"'.
-CLUSTERDEBUG		opt_debug_cluster.h
 DEBUG_1284		opt_ppb_1284.h
 LPT_DEBUG		opt_lpt.h
 PLIP_DEBUG		opt_plip.h
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 6b77adf5df34..60f22fd38764 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -36,8 +36,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_debug_cluster.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -56,12 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_page.h>
 #include <sys/sysctl.h>
 
-#if defined(CLUSTERDEBUG)
-static int	rcluster= 0;
-SYSCTL_INT(_debug, OID_AUTO, rcluster, CTLFLAG_RW, &rcluster, 0,
-    "Debug VFS clustering code");
-#endif
-
 static MALLOC_DEFINE(M_SEGMENT, "cl_savebuf", "cluster_save buffer");
 static uma_zone_t cluster_pbuf_zone;