From owner-dev-commits-src-all@freebsd.org Sun Feb 28 00:43:28 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AAE93559E2C; Sun, 28 Feb 2021 00:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dp4Pr46tpz4cJH; Sun, 28 Feb 2021 00:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7FE1727421; Sun, 28 Feb 2021 00:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 11S0hStO084141; Sun, 28 Feb 2021 00:43:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11S0hSRv084139; Sun, 28 Feb 2021 00:43:28 GMT (envelope-from git) Date: Sun, 28 Feb 2021 00:43:28 GMT Message-Id: <202102280043.11S0hSRv084139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5d684701ca9a - stable/13 - Delete dead CLUSTERDEBUG config option. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d684701ca9a065ae46e35a2c5f6c2bc6df58e6b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2021 00:43:28 -0000 The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5d684701ca9a065ae46e35a2c5f6c2bc6df58e6b commit 5d684701ca9a065ae46e35a2c5f6c2bc6df58e6b Author: Konstantin Belousov AuthorDate: 2021-02-18 09:12:26 +0000 Commit: Konstantin Belousov CommitDate: 2021-02-28 00:42:35 +0000 Delete dead CLUSTERDEBUG config option. (cherry picked from commit 750ea20d3fb143a95ccf3ff84cfbe86cce9b9cac) --- 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 __FBSDID("$FreeBSD$"); -#include "opt_debug_cluster.h" - #include #include #include @@ -56,12 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include -#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;