From nobody Tue Jan 24 22:13:20 2023 X-Original-To: dev-commits-src-branches@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 4P1h7N2gNbz3bgTx; Tue, 24 Jan 2023 22:13:20 +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 4P1h7N1qkDz3Gdw; Tue, 24 Jan 2023 22:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598400; 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=apADyE1YZT2benFmtVUXr3GTRBgLsnRvD7ckkH0Skuw=; b=fRxwKfjIGAZmC9XwOY8eaC7SC4adm3enag6s4Y0ixXE3CG19aaCLwz8AMglabEbVuArOWE eYNFuZtpHHH0kjIlKFDsvGQ+DNHqpZMkALAV/1tGaD7dbF3JJYCVhtVRctfVtW7EoQb+bQ MP/voeCC0xpEo02pHwhILkBq8FgM7WTlJFJGdTbrpxD4ZiWADsOioeEVslvFubHO17cP+Y jT/NPgMFFnzfWQvs7tDUIpt0fEDcMTiLum470xLTbCAWtn1ZUjwFQ/aP9cF76omUFjo6Pz wPWfJOC3Zdg2VmG0QFQBf64UY+C0IazZreoAkDDIwEJw+irR96LUC0agmi1FZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598400; 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=apADyE1YZT2benFmtVUXr3GTRBgLsnRvD7ckkH0Skuw=; b=OwVcyMqmxV81N51muSFsYAqgCldZhdIVAfltOJNXgYuvLx/Uh7zOuiTER4UtFslletvlRS GDDBa8OYMatTMLADbSxOo3/sUTat8QUTVYFNS+hOQ7ApJhORQcm+Dx8cpv1JMF9F8CE8yb ydELaHoqbvP06MhihfPie/cGn5FqEHVxbYjDw1a42ctDf+SSAdxo+Ymu5xVGo2RtBovItj 7Tpz4XHgkKraskoThercMo7fWfUNOgFbDPpAXl47MSHXgV9pH4y51Tbp0HZnbUATY465wV UqceoD63jWZQuJaK/se9FA6toPK8P6XFkfjGclYYYdA0vrVFGZ8NY0tOrurhHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598400; a=rsa-sha256; cv=none; b=cG3dXvBYC3yy3yNqw6sBfvlJ07PMmODj10ODwQXKp7C/DDE8TDXMUt82a9O5PiJIx58EQu 9SOy6L4t3+4QgsakIVjr+5Wdz0GweNfOyR+UzWH3ng/XRebh6YM/X5KW11p/Vx1XpjnWez WY4qKLQRf1SA7idMQK3akjVDEIuievQHTjpG4y2VUeJ2ysrpyLl+mVn39YXRGKQvxSVvYx /Oa9viN5FFVCZCQPnCi7+DuMw0S6ruzmZpBHKUss9Hwt7ujHPZKL/GZjWffcWYobIM43uF /9CWkFoVrI/oXoMtLlJ6Mzg7IumZx4vvTrm/JxBapbDqbM9HD/EIGBr2FhkVeg== 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 4P1h7N0nkkzQq2; Tue, 24 Jan 2023 22:13:20 +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 30OMDKJQ088279; Tue, 24 Jan 2023 22:13:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDKlK088278; Tue, 24 Jan 2023 22:13:20 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:20 GMT Message-Id: <202301242213.30OMDKlK088278@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: e78a4b39013d - stable/13 - stand: make zfs_parsedev static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e78a4b39013de37b8d998fec5b6c314419037889 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e78a4b39013de37b8d998fec5b6c314419037889 commit e78a4b39013de37b8d998fec5b6c314419037889 Author: Warner Losh AuthorDate: 2022-11-30 22:09:14 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:39 +0000 stand: make zfs_parsedev static It's now unreferenced outside of zfs.c. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37344 (cherry picked from commit 90412431fe1bf5f4a10b68c7938b0fc9f11dc4a2) --- stand/libsa/zfs/devicename_stubs.c | 7 ------- stand/libsa/zfs/libzfs.h | 2 -- stand/libsa/zfs/zfs.c | 5 ++++- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/stand/libsa/zfs/devicename_stubs.c b/stand/libsa/zfs/devicename_stubs.c index 4b1ebca8e5a3..44df5251118a 100644 --- a/stand/libsa/zfs/devicename_stubs.c +++ b/stand/libsa/zfs/devicename_stubs.c @@ -30,13 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include "libzfs.h" -__attribute__((weak)) -int -zfs_parsedev(struct devdesc **dev, const char *devspec, const char **path) -{ - return (EINVAL); -} - __attribute__((weak)) char * zfs_fmtdev(struct devdesc *vdev) diff --git a/stand/libsa/zfs/libzfs.h b/stand/libsa/zfs/libzfs.h index a8ce762d2bc2..b6b6cd78f073 100644 --- a/stand/libsa/zfs/libzfs.h +++ b/stand/libsa/zfs/libzfs.h @@ -48,8 +48,6 @@ struct zfs_devdesc { uint64_t root_guid; }; -int zfs_parsedev(struct devdesc **dev, const char *devspec, - const char **path); char *zfs_fmtdev(struct devdesc *); int zfs_probe_dev(const char *devname, uint64_t *pool_guid); int zfs_list(const char *name); diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index 96b0509149f8..db4bed7f7697 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -66,6 +66,9 @@ static void zfs_bootenv_initial(const char *envname, spa_t *spa, static void zfs_checkpoints_initial(spa_t *spa, const char *name, const char *dsname); +static int zfs_parsedev(struct devdesc **idev, const char *devspec, + const char **path); + struct devsw zfs_dev; struct fs_ops zfs_fsops = { @@ -1629,7 +1632,7 @@ struct devsw zfs_dev = { .dv_parsedev = zfs_parsedev, }; -int +static int zfs_parsedev(struct devdesc **idev, const char *devspec, const char **path) { static char rootname[ZFS_MAXNAMELEN];