From nobody Tue Jan 24 22:13:21 2023 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 4P1h7P3CF2z3bgWs; Tue, 24 Jan 2023 22:13:21 +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 4P1h7P2l46z3GcS; Tue, 24 Jan 2023 22:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598401; 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=LdYhB0hlfkcbb03XSoYd8EGNiV6yuC4CGoD9Mil2B9E=; b=c37FBYmN4d5l91BrGX54IOaKXhP1w0iJPxnsLTbpehEU95jECBhE7dagF/Ay6240yPbkvS h5Gnv/w3+KVtxI9ESUxdSMZnqPGtVCrc5Sm1wMXW2wHPV6iNnTkKkC9WWokpU6oZTQ5ckA pzNqBmTeF72hi2wyRVpr48xZJFvkjP44yAki9OP4pra+ji2WPHOvc9NSfbk3qFtnZW9lQS mfYElSNeXhSlprk63DGLtnXwgLTHeRCDcuNSKhLVT3IkeOV8X5/0ZX2g2j4E8kzh8/w3UJ bdgwSvcVWBDvzirWrdkZ7RIIKaVEHg/Ta2mDHbJi3PTj0Cz4tcWHS75Di8Y2Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598401; 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=LdYhB0hlfkcbb03XSoYd8EGNiV6yuC4CGoD9Mil2B9E=; b=uBEgDvPhhPaYgalnhDwFVepmb5uVKf9ZVlj+ZW8J/SYhK1JqMAFHhGodVImdrMEd0BxjQV uV102fod9dfNRrY4kQYbG/WCFZJq5XRzuBy7H0fNIuZOfGICXJdmEZpfOS+qNrgCpfC90D zIDm8+FV6E6rcDZ+D+cUEWRSsMalwzjKPlLMKSiDIYz49mx0E/vzNLNwXphaEpCivOCHSC kSx06aaVTjv/bVZsoHkr975cMQjUBgVJSRThfVJKIquUPuoE6vay7WJoEZ+/qKAeBj0yPi 6uXNR6DtRvDAE2LId1YlaGFQX9coWTg4OC4fwiZYJnbnFSu72m0Bt4hlCOtzow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598401; a=rsa-sha256; cv=none; b=pBp5lyH9h6cLHlf8Ythw+PVTAilJr7W2rK9nXxACwxbNhfkmNaGZ579IGF1dslqMaMfEOU NVPVhdUcmcWov310thUXkdFyswqJeGuk8oYMz+9TG1n/ahtbkaARBEgJ8Zw39C9/dwcH0A ZUJrvDyDhaCeY66E8WyM5wvvPnhT/VBTleHD/ywkdusX7/WEaGbN3BpRw69Jln5GrQvqHe /eq13rjVRg7RvXgHI/LuaYKJcWVE3RZu8OeqX0uNnzIBw/LmJzVIjBgo3nLvdI4buje9Qp XHB2p8Y9d9L+D25VaMcrzK6cUA/5LzJTqXS/2JyivaSXrYl+hQxA8aR5XPXTvg== 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 4P1h7P1qLMzQh1; Tue, 24 Jan 2023 22:13:21 +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 30OMDLRT088304; Tue, 24 Jan 2023 22:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDLcL088303; Tue, 24 Jan 2023 22:13:21 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:21 GMT Message-Id: <202301242213.30OMDLcL088303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e75f304a5e97 - stable/13 - zfs: Remove devicename_stubs 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/stable/13 X-Git-Reftype: branch X-Git-Commit: e75f304a5e97681a7cde0033bcce539ce9fa283b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e75f304a5e97681a7cde0033bcce539ce9fa283b commit e75f304a5e97681a7cde0033bcce539ce9fa283b Author: Warner Losh AuthorDate: 2022-11-30 22:09:18 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:39 +0000 zfs: Remove devicename_stubs We no longer need the zfs stubs since we're no longer referencing these functions outside of zfs.c. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37345 (cherry picked from commit bb9f61da17f66352a344e14c4d32fda83126827b) --- stand/i386/libi386/Makefile | 5 ----- stand/libofw/Makefile | 4 ---- stand/libsa/zfs/devicename_stubs.c | 40 -------------------------------------- 3 files changed, 49 deletions(-) diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile index 1b23cd53d137..2b2cfd82812e 100644 --- a/stand/i386/libi386/Makefile +++ b/stand/i386/libi386/Makefile @@ -10,9 +10,6 @@ SRCS= bio.c biosacpi.c biosdisk.c biosmem.c biospnp.c \ elf64_freebsd.c multiboot.c multiboot_tramp.S relocater_tramp.S \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.S \ time.c vidconsole.c vbe.c amd64_tramp.S spinconsole.c -.PATH: ${ZFSSRC} -SRCS+= devicename_stubs.c -CFLAGS+= -I${ZFSSRC} .PATH: ${SYSDIR}/teken SRCS+= teken.c @@ -44,8 +41,6 @@ CFLAGS+= -Dalloca=__builtin_alloca CFLAGS+= -I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \ -I${LDRSRC} -I${BOOTSRC}/i386/common \ - -I${SYSDIR}/cddl/boot/zfs \ - -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ -I${SYSDIR}/contrib/dev/acpica/include # Handle FreeBSD specific %b and %D printf format specifiers diff --git a/stand/libofw/Makefile b/stand/libofw/Makefile index 2d3e30e1ace9..0406224040e3 100644 --- a/stand/libofw/Makefile +++ b/stand/libofw/Makefile @@ -7,10 +7,6 @@ LIB= ofw SRCS= devicename.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ ofw_time.c openfirm.c -.PATH: ${ZFSSRC} -SRCS+= devicename_stubs.c -CFLAGS+= -I${ZFSSRC} -I${SYSDIR}/cddl/boot/zfs -CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/common # Pick up the bootstrap header for some interface items CFLAGS+= -I${LDRSRC} diff --git a/stand/libsa/zfs/devicename_stubs.c b/stand/libsa/zfs/devicename_stubs.c deleted file mode 100644 index 44df5251118a..000000000000 --- a/stand/libsa/zfs/devicename_stubs.c +++ /dev/null @@ -1,40 +0,0 @@ -/*- - * Copyright (c) 2012 Andriy Gapon - * All rights reserved. - * - * 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$"); - -#include -#include "libzfs.h" - -__attribute__((weak)) -char * -zfs_fmtdev(struct devdesc *vdev) -{ - static char buf[128]; - - return (buf); -}