From nobody Fri Oct 08 06:11:22 2021 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 5618412D462D; Fri, 8 Oct 2021 06:11:36 +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 4HQd9z38NBz3LTY; Fri, 8 Oct 2021 06:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6F9FE21EEA; Fri, 8 Oct 2021 06:11:22 +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 1986BMck010357; Fri, 8 Oct 2021 06:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1986BMDq010356; Fri, 8 Oct 2021 06:11:22 GMT (envelope-from git) Date: Fri, 8 Oct 2021 06:11:22 GMT Message-Id: <202110080611.1986BMDq010356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 395614be592d - stable/12 - loader: allow loader to accept zfs feature com.datto:bookmark_v2 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 395614be592d2825e6f52860bfb5befb4d588ede Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=395614be592d2825e6f52860bfb5befb4d588ede commit 395614be592d2825e6f52860bfb5befb4d588ede Author: Toomas Soome AuthorDate: 2020-12-15 21:48:35 +0000 Commit: Kyle Evans CommitDate: 2021-10-08 05:24:28 +0000 loader: allow loader to accept zfs feature com.datto:bookmark_v2 We do not need to actually read bookmarks, just whitelist this feature (cherry picked from commit eba724f361693a52721b2626d800a7e117af67ac) --- stand/libsa/zfs/zfsimpl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index b8b06fd862d1..9efc67db318a 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -122,6 +122,7 @@ static const char *features_for_read[] = { "com.delphix:zpool_checkpoint", "com.delphix:spacemap_v2", "com.datto:encryption", + "com.datto:bookmark_v2", "org.zfsonlinux:allocation_classes", "com.datto:resilver_defer", "com.delphix:device_removal",