From nobody Wed Nov 30 22:31:21 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 4NMv7Y5sVgz4jCSJ; Wed, 30 Nov 2022 22:31: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 4NMv7Y5Kf8z43xD; Wed, 30 Nov 2022 22:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669847481; 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=lgjD4V+xZPBh7Ihz+ZG0ciNcJdkpzw1WxzeYZpcXY/M=; b=wtx9MnA3jxVtBcJniK87nCyG8sAbR9sCSUc2KaOFfoitbsQlAzv9T6fk0ZlgehFzTW82Gy R+wl7LXnk0NTLbGhwej9qZfJ/IuPW0lsuncAAWnvKkmdVhtUs5xcvSquxX6+XIq+RtQfaw pmCczxfRz6Hf/5FQa0+TCBntQkm2PhBWK3Iq0s12OM8vf/SZcY4UufP926K0IcTUYvdmdi XPJBHv0LqV4e00KO5z/YgSvkJZ2AI10LYZqwQLQUNUYWo07F98Yw2zZMLz3VZDnoPJsYmD uOXgtcvtIKdwhZXmgod3chduH1Q58szwZMvKNQlwFe+CyecwMlE8yl83wCxBZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669847481; 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=lgjD4V+xZPBh7Ihz+ZG0ciNcJdkpzw1WxzeYZpcXY/M=; b=Y18OwEQiEjkDLQ4WOiaKuNYlqfWPSG1XjsDYh2Dcu0uRHEhKe6IJs1o3ANyBr6bHJsBx3Z VbwoU0eIZZQmi+u6q4l9qzv2CpzMk9qMfIleyk8xhbbI1QC8gRs48jaSL3meRSqF/iUYOx dZb/by5chW/RMSPQsss6LbvRtLwB46+qCFZe85aRCytHqjNF1t/4VAgErwyugqANDi1c91 ztLALPku/mJL+n18bVK2Oysbe3K1pwtTv+1kURPf6cfyhcACeQL4IaJKMva2rs7NSzMk8C LJLPnTqSl8jEB6EUgcI14sgiEOk0JsPwN3gCwpezMdGIxjbpk/fXbKvR/05GCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669847481; a=rsa-sha256; cv=none; b=suovXHI+fAtgsKgU3erS09Vm30vQQdkgk3uFDmKH5KvqW37sa6kTTPLlYBQy6xMqwEJxm/ zTSlJgm/a3D4Zlv75rN6RNit8drnHnIT6dJWdxNuNuH5Ic09sBN3yTl007zYNHNGcYh5zS hkxoHQE+9BuMGs8tLADQ3aSSphKfQgbr9uDhJfemDj5p/IKomTLaLvxABhLm3U8sm8dhiZ nBw+M7kBU9HSzwdxqf95hWpM9YU0WmMF8EHUy9MiHyC3rM8/Z+8RG2w3RXXdF97L/cx6Wv nI1SohuQFg2wuRv/a8/fcKdqZLQyidT9HeSkmbuag4yzjztiv5T6chKf343k3A== 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 4NMv7Y4Mcyz1CtR; Wed, 30 Nov 2022 22:31: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 2AUMVLp1023504; Wed, 30 Nov 2022 22:31:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUMVLjD023503; Wed, 30 Nov 2022 22:31:21 GMT (envelope-from git) Date: Wed, 30 Nov 2022 22:31:21 GMT Message-Id: <202211302231.2AUMVLjD023503@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: 90412431fe1b - main - stand: make zfs_parsedev static 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: 90412431fe1bf5f4a10b68c7938b0fc9f11dc4a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=90412431fe1bf5f4a10b68c7938b0fc9f11dc4a2 commit 90412431fe1bf5f4a10b68c7938b0fc9f11dc4a2 Author: Warner Losh AuthorDate: 2022-11-30 22:09:14 +0000 Commit: Warner Losh CommitDate: 2022-11-30 22:30:32 +0000 stand: make zfs_parsedev static It's now unreferenced outside of zfs.c. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37344 --- 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];