From nobody Thu Aug 11 16:27:45 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 4M3XKF5Zfxz4Ys1T; Thu, 11 Aug 2022 16:27:45 +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 4M3XKF4JKYz3qRW; Thu, 11 Aug 2022 16:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235265; 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=neAhZN+2gUYxW7oLMVdPUl9Pv8ffoq2m2OaDX6nDvYY=; b=RNAMgckfPjgQqeBuqZzgIVtuUzKZtxwj03ZlTPVsNn8yXWLVLmP77LzhwlsOldZa66pIS0 S7JjRh8HLlABSxJ/IAbz7jgRG40Lds0nCYNqT4LMMXF51wCxTX85Ggu9GbnGLvYNWzgzeH zU3iP3eQ0c2louDExxGaKMDIP/GdcbJk/L5P/Toxtk6kqNlLIUJaxI2uapbNGQLJ7XxwgV wrdJsGohKR73cYfEGQFglJmD68vRK+fyRPp8HsDFwL57GTiFIH0v8jbB/sXXoUdfKn8Twf XvF0FZ2lxezYrILsIB2pimxxcgWf2roVYf3qhA3hX2ZerglMq0vy3kAGzX7jhw== 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 4M3XKF3Hp3zy1J; Thu, 11 Aug 2022 16:27:45 +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 27BGRju7055456; Thu, 11 Aug 2022 16:27:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BGRjXC055455; Thu, 11 Aug 2022 16:27:45 GMT (envelope-from git) Date: Thu, 11 Aug 2022 16:27:45 GMT Message-Id: <202208111627.27BGRjXC055455@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: 654b7837a6a0 - main - stand: For zfs, set dv_fmtdev to zfs_fmtdev 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: 654b7837a6a08ec5b51635badd14794754fab7c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235265; 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=neAhZN+2gUYxW7oLMVdPUl9Pv8ffoq2m2OaDX6nDvYY=; b=AlK7UEPbrbEgGt6PfeLPV5xEl+2MxRCcXKqKeYJ5WsLin0va1ZIe1vLZuMEVzc+K6UqFI7 6XFnYO97mr6ATKBJz6M7FE6Vz3AQzdU+SXwVMYuTq7AkN2a939Lwl9+i1JQ8qJVZP7+517 qalg9/XI1cgy1552rSAjeJU8PXdUpdpJHqPTTeN2kNEJI4vjI4NppC9Akm9ZY+EIW/FLGt l+5mH+Uk9c9dwkgS7yOB0nD+2/T98XoHVzovNr2XZyiFGhwdebjjCUBeSZMHd2L3ruakI2 L6LtCuFacnExMA1lEAoA+b3pwTXhmrEoEKJ9YV7oiQdh4LtY3+M7hQZiLi78Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660235265; a=rsa-sha256; cv=none; b=RZHotL89bCfHDCiiGlNh+EHtION5J2xN2KMMJ5rLPOM4kfM+JJA+coj0ouUVNKWphc40qV J+oEmBUht7ch2QRQ3kyHBgfHsS4GXO6AH5635NNNGsjcF6tjR1wLEDSD4MhGAlWkUicn2i 5zVvUAZDtBlr1rumivoOiXiseYmMIThrTl7lJMDmc+HLz9cEsgYVkumZL2Ohp3HUACnZZU kndPQ63t+nDrrBTMsqpc4hENqzR4TW7N5cLkKJ9mDMqkizViUkI/oAqWZCX9zRlBwiQRvY atpaE42xCij+SeMSTOE7Ijk+IewM8Gj3h31OL1EaNsQ7/mKbuwVHYK4sa9R8Dw== 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=654b7837a6a08ec5b51635badd14794754fab7c5 commit 654b7837a6a08ec5b51635badd14794754fab7c5 Author: Warner Losh AuthorDate: 2022-08-11 15:07:26 +0000 Commit: Warner Losh CommitDate: 2022-08-11 16:27:16 +0000 stand: For zfs, set dv_fmtdev to zfs_fmtdev Add a generic way to get the string representation of a zfs device / mount. Sponsored by: Netflix Reviewed by: tsoome (prior version) Differential Revision: https://reviews.freebsd.org/D35923 --- stand/libsa/zfs/Makefile.inc | 3 ++- stand/libsa/zfs/zfs.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index b85433f4873f..b168451e24d0 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -60,7 +60,8 @@ CFLAGS_EARLY.zfs.c += ${ZFS_EARLY} # zfs.c is special: we need to define HAS_ZSTD_ZFS to get zfssubr.c to initialize zstd # properly. We need to have the cddl boot compat directory in the include path for zfssubr.c # to be found, and we need a couple of other include paths for skein and lz4. Finally we -# temporarily need LDRSRC to pick up disk.h until that layering violation is corrected. +# temporarily need LDRSRC to pick up part.h until libsa has a way to look into partitions +# or enumerate them... # CFLAGS.zfs.c+= -DHAS_ZSTD_ZFS \ -I${SYSDIR}/cddl/boot/zfs \ diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index 5392bcaa4fb1..0ac67d750fcd 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -1634,6 +1634,7 @@ struct devsw zfs_dev = { .dv_ioctl = noioctl, .dv_print = zfs_dev_print, .dv_cleanup = nullsys, + .dv_fmtdev = zfs_fmtdev, }; int