From nobody Tue Jan 24 22:12:00 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 4P1h5s2Xrgz3bfrF; Tue, 24 Jan 2023 22:12:01 +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 4P1h5s18W1z4QHP; Tue, 24 Jan 2023 22:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598321; 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=x4poz7yrzGQTVVzJshN8izw+MNRovx1rl517Gir0ZtM=; b=dwqTF/bjsJIzTq1joEEjPT4BEfPr1yRilSCqTHK//oTJ9gfwZg3I2QU65vYp1BgLr73Dkk 57XYuHWVoqYShsthMDuAvueFTFikK1fy3FvaqPeYoDonWAUUKV1EJOlEhn3egx9HfznR3o KCd/bMDmUewVela7Ni2Mo0MOtOMEBbET6k9ACJGzxHj75t4CLVZvPvneyJpZjsKm2LzKD1 4dQLmBP48htaw5YAeHrjRWElHDliKbhqxZA0uEeC4aWc6CMn9eokyFL43nKs0RQ2A9m4// dhmvtJMw4immEQ44ahsQ9efKU1LFR0KakWR95ZfMV5NPFaNq0cD9sXkql1sZoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598321; 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=x4poz7yrzGQTVVzJshN8izw+MNRovx1rl517Gir0ZtM=; b=Pht8gHL5bcgAq0H5ZeZCdJNQKhUYYNQB5ZEpDPbT+J8RJqGk/cPs1oIdUJamizOpPrP79q x2Ua7BilBl6gThe7ISfvuNpgy9hDChsZ1leCSWWgTF/lmV0WxiRLnbM79WPu4B7swysUE4 bS6bsiqwqUuFi9Sov87ItpDivpJhKyabUjccqumDdRZFkuzQ5F6tq7dU2NvQQSGpvSxMUA yNAcC8/KmhNHqvtvawcHKKsaXnUUIOhJ4TP8dEe7ikyZfSwG+nUtM0WpwmHicXKcDbLWqA YDeNE02km/0mG/6cMdi7b7jwK8yLzW5HzookNh4H0ZEKndROnhuAhCaShxYjSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598321; a=rsa-sha256; cv=none; b=PPTLgut6t3PssdL3hOTVHDek+E0pB4tA4Fo2lJltIcFsK5kwTo7wRz75wHNplXPiV7/BQg f0+1RLxPc3nMMOtScADwSBZlGOMzLo8qHgwibx5VODrAZaKXIZ4x+LZvG/lcjdPQBpDjZ2 JE3EFVAqCwK5qzg/fuTnGqHjhqlMO6pgsiTJHazQsHQ4zYsKXUis1Lcq2XSvvwN/papCEW uPN18WYEJc+wCdVAWbME/6lYtMUqcMhT6AezzCIOPiRUEwAucd9LmwcXVLsOsWxGJaC/9b uaN7hR61sRbyZPYjHg89cPCicP3XF7880O3FEhI8f6t0ff3x8zcOtENMqdI5iw== 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 4P1h5s0Cy0zQV4; Tue, 24 Jan 2023 22:12:01 +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 30OMC00s085502; Tue, 24 Jan 2023 22:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMC0WX085501; Tue, 24 Jan 2023 22:12:00 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:00 GMT Message-Id: <202301242212.30OMC0WX085501@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: 2d0afc3e0a8e - stable/13 - stand: For zfs, set dv_fmtdev to zfs_fmtdev 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: 2d0afc3e0a8e77778c9cc53c3bbedc71df305697 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2d0afc3e0a8e77778c9cc53c3bbedc71df305697 commit 2d0afc3e0a8e77778c9cc53c3bbedc71df305697 Author: Warner Losh AuthorDate: 2022-08-11 15:07:26 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:31 +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 [ Dropped changes to stand/libsa/zfs/Makefile.inc file, depends on newer OpenZFS ] (cherry picked from commit 654b7837a6a08ec5b51635badd14794754fab7c5) --- stand/libsa/zfs/zfs.c | 1 + 1 file changed, 1 insertion(+) 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