From nobody Fri Nov 17 08:57:00 2023 X-Original-To: dev-commits-src-main@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 4SWrPT2R88z50jq3; Fri, 17 Nov 2023 08:57: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 4SWrPT1tLdz4ZKV; Fri, 17 Nov 2023 08:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700211421; 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=VMwMMRv0eerrx2OEvwZhDBxIfZ9HhH7wuGHZcOu01Uc=; b=j5hh8JnWbthddD65LQZXR5v+Am/ca2DqS1+K3h2wQADrdTKe7exSQF1w56pz2/IZam2CHY gBJLl4eM5kWK2Z1lD4v+tB6cnRU1gjK2xBlvd2LVbjilZn1HV2FSITMJpAJJpXa6nDisxb R3x49YFx/QCeSal4EP9POf3abiwXpbKUJXojZ2p1IfTT1V/8ToT2bZGLobNPlBHVVXeV3b WyoUjuCsQHJRxrYznIaYZAmOcnb8rruJHXIHg/0zIx61wb5lopLRlilzpRNlE+BRlYTerv wNez9sXPWE7ltnC1KEbqIOVFPXsWiHpQpF5iNr1VZd91/SUca2gx0L5Kgzz4pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700211421; 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=VMwMMRv0eerrx2OEvwZhDBxIfZ9HhH7wuGHZcOu01Uc=; b=RCeaQeLn8z2fch3jMccVYgxJMQovnGwjiMNZeC67l1Q2+e9meQWJWtOoPk2EHxcL7Ic9oj 0T8Ernzfbu46eJnh9MIP1PUIA/CBfKO3CwmJYxDZNV2dSKxb0x3SBemtwaRmpH7IQBczzR ILI1O2sDn4+TY9LK3kArnIRtkghwoACrWlU4Vu+DovOuU/1DCFtEss1LODn7j/PwFgbFyr icRuK7QP7BUenpcaLuwVsAl7HeQGXeLDLbxI2QBxfzszvH92eemDJsofnLfTHMFgS8t/mU MwUPz0HUlYHaa9u5qLMveRcT5R1Joz7XJYYNbN6KO4QRViAsdeL22WxEGDQGUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700211421; a=rsa-sha256; cv=none; b=XpFVd9+aed5lsJZwDNvJ8koIYFxjZSwZy3K6sIojTe9dGKJ2k2+eBxwHy0hoDiEJ4usqTe znJZWOnCSdyz/vrrIwxq8kDYdTjpJZHRyJRWoN80cW3hVtgb4u+lImzBNH5jNH21vUWt+S XVUQPcizZvZTf6H36uVvKOa/JBZ1Po/Y2CQxQENV2NbrdGpUjSEhgQwWgcpYcYbI07yHbM 1YuynmZ6NVi9i1ksz67H9iRMfaFBY5gBSN371qSVjAvRYSijIIso3VxL58Oc4IN8tE1ois zUVm8q7ojzeQ0358JEvchdWBepZsfeiq4yENt/fVUZDGnTVGa+/FdauU6C5z2g== 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 4SWrPT0xw8zck7; Fri, 17 Nov 2023 08:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AH8v1eO055790; Fri, 17 Nov 2023 08:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AH8v0qF055788; Fri, 17 Nov 2023 08:57:00 GMT (envelope-from git) Date: Fri, 17 Nov 2023 08:57:00 GMT Message-Id: <202311170857.3AH8v0qF055788@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: 47bb16f8f092 - main - zfs: merge openzfs/zfs@03e9caaec List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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: 47bb16f8f09238e8d46e9e441a837e4bb28f6a00 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=47bb16f8f09238e8d46e9e441a837e4bb28f6a00 commit 47bb16f8f09238e8d46e9e441a837e4bb28f6a00 Merge: 70e30addafe4 03e9caaec006 Author: Martin Matuska AuthorDate: 2023-11-17 08:39:42 +0000 Commit: Martin Matuska CommitDate: 2023-11-17 08:39:42 +0000 zfs: merge openzfs/zfs@03e9caaec Notable upstream pull request merges: #15516 da51bd17e Fix snap_obj_array memory leak in check_filesystem() #15519 35da34516 L2ARC: Restrict write size to 1/4 of the device #15529 03e9caaec Add a tunable to disable BRT support Obtained from: OpenZFS OpenZFS commit: 03e9caaec006134b3db9d02ac40fe9369ee78b03 sys/contrib/openzfs/.gitignore | 1 + sys/contrib/openzfs/META | 2 +- .../cmd/zpool/compatibility.d/openzfsonosx-1.8.1 | 1 - sys/contrib/openzfs/configure.ac | 1 + .../contrib/debian/{changelog => changelog.in} | 6 +++++ .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 4 +-- .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 2 ++ sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 4 +-- sys/contrib/openzfs/man/man4/spl.4 | 8 ------ sys/contrib/openzfs/man/man4/zfs.4 | 5 ++++ sys/contrib/openzfs/man/man7/zpool-features.7 | 9 +++++++ sys/contrib/openzfs/module/Kbuild.in | 4 +++ .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 11 -------- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 4 +++ .../openzfs/module/os/linux/zfs/zpl_file_range.c | 5 ++++ sys/contrib/openzfs/module/zfs/arc.c | 30 +++------------------- sys/contrib/openzfs/module/zfs/spa_errlog.c | 6 +++-- .../openzfs/tests/zfs-tests/include/libtest.shlib | 15 +++++++++++ .../openzfs/tests/zfs-tests/include/tunables.cfg | 1 + .../tests/functional/block_cloning/cleanup.ksh | 4 +++ .../tests/functional/block_cloning/setup.ksh | 5 ++++ .../tests/functional/cache/cache_012_pos.ksh | 20 +++++---------- .../zpool_create/zpool_create_features_007_pos.ksh | 10 +++++--- 23 files changed, 87 insertions(+), 71 deletions(-) diff --cc sys/contrib/openzfs/.gitignore index 47d17ae16d34,000000000000..a2cb92dd5406 mode 100644,000000..100644 --- a/sys/contrib/openzfs/.gitignore +++ b/sys/contrib/openzfs/.gitignore @@@ -1,89 -1,0 +1,90 @@@ +# +# This is the top-level .gitignore file: +# ignore everything except a list of allowed files. +# +# This is not the place for entries that are specific to +# a subdirectory. Instead add those files to the +# .gitignore file in that subdirectory. +# +# N.B. +# Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. + +* + +!.github +!cmd +!config +!contrib +!etc +!include +!lib +!man +!module +!rpm +!scripts +!tests +!udev + +!.github/** +!cmd/** +!config/** +!contrib/** +!etc/** +!include/** +!lib/** +!man/** +!module/** +!rpm/** +!scripts/** +!tests/** +!udev/** + +!.editorconfig +!.cirrus.yml +!.gitignore +!.gitmodules +!.mailmap +!AUTHORS +!autogen.sh +!CODE_OF_CONDUCT.md +!configure.ac +!copy-builtin +!COPYRIGHT +!LICENSE +!Makefile.am +!META +!NEWS +!NOTICE +!README.md +!RELEASES.md +!TEST +!zfs.release.in + +# +# Normal rules +# +*.[oa] +*.o.ur-safe +*.lo +*.la +*.mod.c +*~ +*.swp +*.gcno +*.gcda +*.pyc +*.pyo +.deps +.libs +.dirstamp +.DS_Store +modules.order +Makefile +Makefile.in ++changelog +*.patch +*.orig +*.tmp +*.log