From nobody Sat Jul 09 05:03:32 2022 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 E54F03E597D; Sat, 9 Jul 2022 05:03:32 +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 4Lfyj050j3z3NG6; Sat, 9 Jul 2022 05:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343012; 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=8BiPeJtetAB19IWEDG/5YvfxgDK2WRxaqbHCaG3purs=; b=cX42Dtw9CjUZGFrGcw+0+tisdoq7onOGczI29bPBa0yFrv8mkfah4ZzFaBtHdF47YsoxdH 4QH5zruyuqhw5Um08zNLMck50c9CWS3Lfr/kGW6VRB5ckUuB0iktnAjyq7w6Z1wm23uE1+ 2OlxxNn1AyvM9S4TfVzWn01PH1zhtvcdCY426ajX8knpg8HK711B6a/TvFzsfr1YLO0BIM o/QkSMWU53wC6feNYG/MwxpQqDoNb2dfXHyRTDAmf4L8L+/sNQvUZrplwkoyBTWvX9PliI yctKa8dbu/oIPQpoTVYG2cdNjYsfAHvLU0ewZ8oJ5fiaDMAkQqAuZOlxb+Czsw== 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 4Lfyj03qPpzZJT; Sat, 9 Jul 2022 05:03:32 +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 26953Wxv000109; Sat, 9 Jul 2022 05:03:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26953WS7000108; Sat, 9 Jul 2022 05:03:32 GMT (envelope-from git) Date: Sat, 9 Jul 2022 05:03:32 GMT Message-Id: <202207090503.26953WS7000108@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: df76778ad5e0 - main - stand: delete zstd_shim.c 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: df76778ad5e07988d8fc1a512b8523eb7a596a5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343012; 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=8BiPeJtetAB19IWEDG/5YvfxgDK2WRxaqbHCaG3purs=; b=ZN4qrcZWFhgcfSna+N4I/Krw+r/ZtS5oCHwBT+PBw0KO6O9XPku0qxDlZmE5VXSonzu+aJ lWSTjXy+kH4PlfKrh5BEz5zlDTdf8AHYeHB/98fPvqOaG+6byToUR2CdNQkT24Hw8Rv6es y8rGU2zm0uLYQ2r5/BO+oUokFwvvl7WgbxQEyG665z3rBWJGZuP1bk3HLggJ/5x8zxkiTn c5Km82Bh9+nJWlByXh4ukye/LWJDZNCXtcvJUTQQQiZroxZKDyp8uYfCTEtbSwuw+YKOJi 4Ac78/xYnNqj38Rn0ZUSpP4iX9K/LWJnl8PuWgX8bifZBpVrCGIfNVxCsJZ85A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657343012; a=rsa-sha256; cv=none; b=EC4+s7Y/vlIKjEpnyGylZJiITB3BqIv4sinVzNTyVkAZ7g1ZTK2MYYM9oDJV0176ig8tR+ m+EAeYXMbhJI8+ic2yeUn3DbLllutm6FcZCQle2wJfYRDBHai3ME/qA7eF51VLmoAGTSPZ bx10xKy2xD6I4Wx6T7TOue5OdnCshctF4dCOpB3XcmehfWTFdeMfosAHlJuAfA9rIDoPE+ IvYs0yr3rC87eQ8vLkeoXjhcFAv408Btx4EqVT5bzPivVuo3nAhDHXZSOo0/LQ47sRk28R DbPmlYo8znSL4kseLI2At1iBCLnsAzc7UCkmq91T+yxmB6APPFi4EPhGiVPtew== 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=df76778ad5e07988d8fc1a512b8523eb7a596a5a commit df76778ad5e07988d8fc1a512b8523eb7a596a5a Author: Warner Losh AuthorDate: 2022-07-08 23:35:02 +0000 Commit: Warner Losh CommitDate: 2022-07-09 04:49:56 +0000 stand: delete zstd_shim.c We no longer need to use this to get zfs_zstd.c compiling, so delete it. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D35750 --- stand/libsa/zfs/zstd_shim.c | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/stand/libsa/zfs/zstd_shim.c b/stand/libsa/zfs/zstd_shim.c deleted file mode 100644 index b1ba4babcf36..000000000000 --- a/stand/libsa/zfs/zstd_shim.c +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * Copyright (c) 2020 M. Warner Losh - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ -#include -__FBSDID("$FreeBSD$"); - -/* - * Small amount of shim code needed to get zfs_zstd.c to compile. These items - * here should all be defined in the SPL or as part of libsa somewhere, but - * aren't for reasons that haven't been tracked down yet. Ideally, they would - * all go away and we'd compile zfs_zstd.c directly. Based on an original by - * Matt Macey, but only the #include remains untouched from that. - */ - -#define ZFS_MODULE_PARAM_ARGS void -typedef int boolean_t; /* This one may be tough to get rid of */ - -/* TODO: openzfs/include/sys/uio_impl.h must not be included */ -#ifndef _SYS_UIO_IMPL_H -#define _SYS_UIO_IMPL_H -#endif - -#include