From nobody Sun Jul 24 22:55:48 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 4LrdnJ5Yxbz3yvNw; Sun, 24 Jul 2022 22:55:48 +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 4LrdnJ4bNJz4242; Sun, 24 Jul 2022 22:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703348; 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=Mj9HPmA9mRKkPAgY8cYxjCf6zYl1tI3VDE+jH9lM3q4=; b=yhk5NyXH1f+a0H0m6sJo7xC6N1wIckqIL23+pJX8PSIZJ0jI5zgkB9diDQlc7YDEI/cdSR h7vHXZcVEoXz1+0zfBo6U6kP91GppKHHKSs0IbmGFyOo8coNi6ypFBEM5aQ0HNWbBwwrUX UUdGMyb+bKbrNrhV8homSItjEU1KsiuqXZshNyQRr8Q8L6BjpC3OsD4S3g8QKTont65F37 KeC6xhPyuKgEm9r4/1Xaa0rcU7JErskvaRSDNboQVDsOamBreQ6+MS2/N/oDGJBf9P79F8 wCbn0/pJ8jTAE9bNM1nhXSkEBCdHU1ML476JxvDGjapFOiDJXn2B8fI+CPRn9w== 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 4LrdnJ3dfgzbhl; Sun, 24 Jul 2022 22:55:48 +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 26OMtm4t004702; Sun, 24 Jul 2022 22:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OMtmAp004701; Sun, 24 Jul 2022 22:55:48 GMT (envelope-from git) Date: Sun, 24 Jul 2022 22:55:48 GMT Message-Id: <202207242255.26OMtmAp004701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 976b977c61fb - main - zfs: Increase compatibility for different environments 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 976b977c61fbbc4b6a10a16ea225ad6a1a0e82ba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703348; 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=Mj9HPmA9mRKkPAgY8cYxjCf6zYl1tI3VDE+jH9lM3q4=; b=xTtlBdCiGPZKlwY0NJZQDLbe7Mz5pWi7x+bE3X/1qh2SWDA42PW1ceMj7qsNsrE4P7IJTF jnrqHswJ8+GnEqMN+hcZ2q34MNyC9cENejffoSAMSqIrXiDsyaVFu+LlnIdNk08b5+E16Y Fd7HJX4xIaF/LhEFO1vuiWd9snWyrw80BLm7FR/TEP790vQSbdbjdw3L2c+1VsYemPShU6 7KkGPA31WFKOxORsEktYp9Y6C+EISolSl7aPxoiwL/GAuIy/YBHdt+3XEJXr7y6sWxqZw8 UpxM/zld4XdsoYoITmlxRPtWuRkO2gRk0hidDWnCFUAM7WJ/yN3xA35ztDbV6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658703348; a=rsa-sha256; cv=none; b=JpIbd/HNGdnzCKPJ9uASJv8YdAKFvPnxxuIAYomFKFi6dscy7B5I7okCtU1B1BQqyOyywP DMt9I95wiPQ4LwxUzW05krsTsLOeoI0CXNj3nrEFTBuWlMl340IkYr6gbcYOSWDNyebpmw RPFLbGIVDE/mSisnDxQMRaOVWA7Js4aciPdpCwWi7BXLJ3AwuzD7GNikQ7abvF6CaeRxHO AGH5p1J/LEEyQZbbKQENxfNIBR9maQ9ndx1jw1ONuKKFGwqa8VFWaWtPD9GORUaDuA76+C kRkohDsrEcjKZBiWBjqwKo7kr4WDSwXgUxLagd/PffuO5d2u6IKQEhWMIcDZTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=976b977c61fbbc4b6a10a16ea225ad6a1a0e82ba commit 976b977c61fbbc4b6a10a16ea225ad6a1a0e82ba Author: Warner Losh AuthorDate: 2022-07-24 21:53:14 +0000 Commit: Warner Losh CommitDate: 2022-07-24 22:53:36 +0000 zfs: Increase compatibility for different environments libsa uses the full OpenZFS compilation environment when we build this included in zfs.c there. Other parts of the tree have not been adapted to the full OpenZFS environment yet and need these ASSERT* defines to build properly. Since the ASSERT* macros are normally defined in sys/debug.h in the OpenZFS compatibility spl, only define them when ASSERT3S is not defined to cope with the parts of the loader that don't yet use the full OpenZFS environment. Sponsored by: Netflix Reviewed by: tsoome, delphij Differential Revision: https://reviews.freebsd.org/D35893 --- sys/cddl/boot/zfs/zfssubr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cddl/boot/zfs/zfssubr.c b/sys/cddl/boot/zfs/zfssubr.c index c5ee4fda4579..1dcb0829680c 100644 --- a/sys/cddl/boot/zfs/zfssubr.c +++ b/sys/cddl/boot/zfs/zfssubr.c @@ -30,11 +30,13 @@ __FBSDID("$FreeBSD$"); static uint64_t zfs_crc64_table[256]; +#ifndef ASSERT3S /* Proxy for all the assert defines */ #define ASSERT3S(x, y, z) ((void)0) #define ASSERT3U(x, y, z) ((void)0) #define ASSERT3P(x, y, z) ((void)0) #define ASSERT0(x) ((void)0) #define ASSERT(x) ((void)0) +#endif #define panic(...) do { \ printf(__VA_ARGS__); \