From nobody Sun Dec 04 05:21:46 2022 X-Original-To: dev-commits-src-all@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 4NPw5l2DVRz4jLYY; Sun, 4 Dec 2022 05:21:47 +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 4NPw5l1Ycyz4P9g; Sun, 4 Dec 2022 05:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670131307; 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=s3S6tvdNUv1+juHH68pJrsGSV9T8hfuG8ug6HSg3YrM=; b=ficIiC6SPS1LAXfTlXlqsIbVuwyJOHPg3bbXCDPOzuRtqd5kz2rzOl2HQd9Jeaaaeehqnv idN4FWYZL+mloX9HF/BJhdRwatAafjROzzZv4lFXLuyNn/Cj6hcQOML8uH11HCWPFnLk61 3Oanm/Pr946Ce/+4336TNIqB1W4n0w/VUSG3N92GbOsR7VyJxPOzZKxKqErlMqQaSNUIiP VavpxmHNtWy6ZFrQKT9a5kTulj7s1dpscYBzlwZl0SRuNl54rkWQKPEoYJjXQtuXsIi+sd EKaCzkpsXxluV52/PwRly7r/AStM8YZpe+L379y3hdqVR58c4XFFGXqlWKdJcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670131307; 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=s3S6tvdNUv1+juHH68pJrsGSV9T8hfuG8ug6HSg3YrM=; b=QGW2c71nGlvng31yns6Ln5Skt9WgZCw8fLjmkxUNRzSTg4C0arQWHvKtB6SOpkXRT99JpX 5BRfVHK2ie+NKMR8z9UGbXJ+yRVsPfba7vLnOGimwsp/IcX5oQwu59s77qHLqv9H6QAyBQ gixN1YZqAR4qGz/T9kYjbla6Az5kWVB2zA+6wbOxaJz4VEAB36DwdaZIawKsMfdthAQD0h rPTMUakkK+NhxgwVkX67me2GPnGCq575B8m2CgWGqAljig20F1xAMbtOS7VHBpb4+TlbUa YHDoldo0Ca/5VatyEYZ9+yY2b92JfXyxbXLDPVyN9aLeJt5+y0qiUFJCnHwfrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670131307; a=rsa-sha256; cv=none; b=ldLy3ovhOU6cleoTyYKRWl9bodr0rEpVhKkuJY4RqvY5mwtQHcZ4zhRz8HWhpika0JM9xU bOD2Zm0ZvQg/QBnHa7eT+mHlPMQF25h/db5cx7CiJopBBMN5M9Yx8rXZHfyqi5P3VK+OmL OswtD8i92MwwnlQS4w+2bmkwIQ/SGfdlQ2n4MbocAvN2Ka2KohFg3C7sQesXUk03vr1JHw 5dO4thEosds4YHNe9ZdrHOVHSeiqDbmP3VoMeZsOOrr0Yq2ipELkOqKt1AWRzktwFhzpvc w87TFsSW6ULZyU8zWQDumKlwvSlh26cIRs57FJgP/AfiyOc+/9qKOujt+Bc36g== 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 4NPw5l0fLKz1MK3; Sun, 4 Dec 2022 05:21:47 +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 2B45LkvY043089; Sun, 4 Dec 2022 05:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B45LkIk043088; Sun, 4 Dec 2022 05:21:46 GMT (envelope-from git) Date: Sun, 4 Dec 2022 05:21:46 GMT Message-Id: <202212040521.2B45LkIk043088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 896c3e6e8a61 - stable/13 - Fix compilation issue when kernel built without FFS defined. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 896c3e6e8a61606adf4414279c4699918f921510 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=896c3e6e8a61606adf4414279c4699918f921510 commit 896c3e6e8a61606adf4414279c4699918f921510 Author: Kirk McKusick AuthorDate: 2022-12-04 05:20:39 +0000 Commit: Kirk McKusick CommitDate: 2022-12-04 05:21:32 +0000 Fix compilation issue when kernel built without FFS defined. This is not cherry-picked because it occurs only in 13 and not in 14 or later kernels. Reported by: Boris Korzun Tested by: Boris Korzun PR: 263979 Sponsored by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_subr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 42f1e1a1cad3..d847373a8cde 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -332,9 +332,11 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk, */ static int prtmsg = 1; #ifdef _KERNEL +#ifdef FFS SYSCTL_DECL(_vfs_ffs); SYSCTL_INT(_vfs_ffs, OID_AUTO, prtsberrmsg, CTLFLAG_RWTUN, &prtmsg, 0, "Print error messages when bad superblock values are found"); +#endif /* FFS */ #endif /* _KERNEL */ #endif /* STANDALONE_SMALL */ #undef CHK