From owner-dev-commits-src-all@freebsd.org Sun Jun 20 08:04:10 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3924364AE21; Sun, 20 Jun 2021 08:04:10 +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 4G74tf0tr7z4crY; Sun, 20 Jun 2021 08:04:10 +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 06A9A2614D; Sun, 20 Jun 2021 08:04:10 +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 15K849mN019691; Sun, 20 Jun 2021 08:04:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15K849Eo019690; Sun, 20 Jun 2021 08:04:09 GMT (envelope-from git) Date: Sun, 20 Jun 2021 08:04:09 GMT Message-Id: <202106200804.15K849Eo019690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 0d8fe2373503 - main - zfs: merge openzfs/zfs@c4c162c1e (master) into main MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d8fe2373503aeac48492f28073049a8bfa4feb5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2021 08:04:10 -0000 The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=0d8fe2373503aeac48492f28073049a8bfa4feb5 commit 0d8fe2373503aeac48492f28073049a8bfa4feb5 Merge: 5403f2c163f7 c4c162c1e8ff Author: Martin Matuska AuthorDate: 2021-06-20 07:18:44 +0000 Commit: Martin Matuska CommitDate: 2021-06-20 07:18:44 +0000 zfs: merge openzfs/zfs@c4c162c1e (master) into main Notable upstream pull request merges: #12054 Avoid deadlock when removing L2ARC devices under I/O #12172 Use wmsum for arc, abd, dbuf and zfetch statistics #12221 vdev_draid_min_asize() ignores reserved space Obtained from: OpenZFS OpenZFS commit: c4c162c1e8ff9ce8833014711875d18df520096c .../etc/systemd/system/zfs-import-cache.service.in | 2 +- .../etc/systemd/system/zfs-import-scan.service.in | 2 +- sys/contrib/openzfs/include/sys/abd_impl.h | 4 +- sys/contrib/openzfs/include/sys/arc_impl.h | 119 +++- sys/contrib/openzfs/lib/libzutil/zutil_import.c | 1 + sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 46 ++ sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 75 +++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 2 +- sys/contrib/openzfs/module/zfs/arc.c | 606 +++++++++++++++------ sys/contrib/openzfs/module/zfs/dbuf.c | 112 +++- sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 47 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 3 +- sys/contrib/openzfs/module/zfs/zio.c | 3 - 13 files changed, 789 insertions(+), 233 deletions(-)