From nobody Sat Feb 01 09:02:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YlRbF3NqFz5mbHF; Sat, 01 Feb 2025 09:02:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YlRbF1TY7z419M; Sat, 01 Feb 2025 09:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LP6ruYQnoJ5jpmEGTzq8ftYJ93Je0OK5rbz18Y8phc8=; b=Rav1AXpuHbnZsORZ1r4rg7DdUuJjtrAQ+swX3BhVxNbAPsvHWVPuRczXkT4cGipKaByqHI Cx690C86SY0Gi+ZNP91VyIoQiqXbXcNYnceSaUzeV66PvyRyC/RIgszu5/lPrUbmocWj3O WJDCOBYpyBIBi5A9+qBiIbmyAR4+jLLa582PCRNmiy0KuYedTE5zdBO+zb28HQIU92byY5 hAixaBYIlYr8IV4G8tOJy7g2EyELIADfWcYziRNiVnnHA8lZYILWniikqYXVL56dMes/XT p2Yn2rdwk470XBQCnfhPWEq86e7P9PC0CldzTQ2pt8C3hbBbAjt5b+jnYGnvjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LP6ruYQnoJ5jpmEGTzq8ftYJ93Je0OK5rbz18Y8phc8=; b=GfVrpRySibwmZPC6CMQm+j9ok1EXflVKH9qLv4uyTUNnXbPDipc5xtSokFWVOma0D/qBSx ZHykir44R3OUbv2U1iJA77ulrY3wHz4uJ7rxfaocYdFG8YvxUZdmzEmSlFDAwy2icI+7Iv 5/J3s1VMU5l0dV/uWXrvatC5OdeTs2MKnXqC+M8pG8tlKW6DRvaZTxT1B4S0tWHlpry/1p xhFLlXXh5DdnKXeUhSqlm/vvDtLYxzMqonxsqv5EU0NQr5A2OW+mLHlHJMmkyBleDbyOut cVlwXTokpjoqpDICOvd8WtqQU2kDJfnR0QuCz51LxGoJXPUa0TfwC9f5bE99WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738400521; a=rsa-sha256; cv=none; b=UTBHFeLhWpNg3cfvU8P8+CRynNVkmFMlJ/R6ixhgBOUEtaAw5Zfp/5UzJSl24h/0AK1qFL R8ukU7LmCiE+gBG/aH3ol9yrANKUL+0sR8E35Wbzp+sO3G6xatqGEp+o7R3TLjN1BTe2nt 5GUe/PsNRfaFchsGj6SR/HvDgClm5VoH8tkuRaskyJzOSVhaqVRdLQdkulaJOEW/S7Kfth Osd5qiXQzCQlIziKtJyWtDGuccXOcloE/d2XvenK41UYO9MaGRlrOjjb7I5LhVdHK3YR83 FzlvQE7NIQLLxTjEU75fDg5XA7RbBjN4BkR2g41P4Sf7UDW30meaAEcZzFHGyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YlRbF11CtzxN5; Sat, 01 Feb 2025 09:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51192184047684; Sat, 1 Feb 2025 09:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5119216D047681; Sat, 1 Feb 2025 09:02:01 GMT (envelope-from git) Date: Sat, 1 Feb 2025 09:02:01 GMT Message-Id: <202502010902.5119216D047681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e1ebda4458bb - main - ffs: fix build with GEOM_LABEL and without FFS, e.g. MINIMAL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1ebda4458bbaf7d85fb803e20f3afc5441f24d9 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e1ebda4458bbaf7d85fb803e20f3afc5441f24d9 commit e1ebda4458bbaf7d85fb803e20f3afc5441f24d9 Author: Gleb Smirnoff AuthorDate: 2025-02-01 03:17:01 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-01 09:00:25 +0000 ffs: fix build with GEOM_LABEL and without FFS, e.g. MINIMAL The root of vfs.ffs sysctl tree was declared in ffs_alloc.c. The 1111a44301da started to use the root in ffs_subr.c. However, ffs_subr.c may be included in kernels that do not have FFS in their config. Such kernel won't link after 1111a44301da. Fixes: 1111a44301da39d7b7459c784230e1405e8980f8 --- sys/ufs/ffs/ffs_alloc.c | 3 +-- sys/ufs/ffs/ffs_subr.c | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 265daef14812..61fb6ccbfc68 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -489,8 +489,7 @@ nospace: * allocation will be used. */ -SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, - "FFS filesystem"); +SYSCTL_DECL(_vfs_ffs); static int doasyncfree = 1; SYSCTL_INT(_vfs_ffs, OID_AUTO, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index e2b09da86ae5..c293cbbcbfb0 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -405,7 +405,9 @@ ffs_oldfscompat_write(struct fs *fs) */ static int prttimechgs = 0; #ifdef _KERNEL -SYSCTL_DECL(_vfs_ffs); +SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "FFS filesystem"); + SYSCTL_INT(_vfs_ffs, OID_AUTO, prttimechgs, CTLFLAG_RWTUN, &prttimechgs, 0, "print UFS1 time changes made to inodes"); #endif /* _KERNEL */