From nobody Thu Sep 21 11:09:05 2023 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 4Rrt2H29yBz4tyGg; Thu, 21 Sep 2023 11:09:11 +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 4Rrt2H1bYyz3CMn; Thu, 21 Sep 2023 11:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695294551; 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=Okcj2bFzF0xrL1kWAr8oLoEfVReQerFkYZlyXXu2tdc=; b=Esq+O5BREZmwHY9tkNCjqAkqI1zGhy7GLw1ToiN7JXLwulKqE0Rzvu0keeLoHNfbyIBOnS gNHvltt/5zsIMm3TUsqRFD5CAV3HQJYe4RlfNaSX3Ici3kNSKbSTI1zBSxUE7q5xh4KvlF RmZm+L6dXVJMjx9qd2zN8u7oKVgNVwoBGwbxOP0imkVetXW8dGxvAFZdesd5a1HNa5n0+x WGJxFjbn9RFAcQTVYbcFz5+0ezY5wzNKkLkLs01sVurIPXjj5APvUKmlszeR9hnWkIs+0d rVQDtDDGPb4LbXXwnvDlT8WA+J6oi3FiOcwrT39qSSHTWUAnNF0bFJ+/hWT2/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695294551; a=rsa-sha256; cv=none; b=QY58RGG/G74B/MWEKj1JhLNW7PNtp4EhA4uRFJslA01OE6V+jGe7PidT+SS/xOOGRIv1OF Eoha75aE8hEZm2aqB+YLaVXvvOEWp6BlINWz1MSNtXnypcwNpSRKo7I8a/SMRYauMiwM5+ PvSIoyGFZgFRDSxAbutifz02wfqSOGqQfNw3W7yPyIAYZv4FgghlBJw1uf9+6h6f/Bzhig EttCKaaIBeuhN3K5kFmXEWDJQ9g2a/rRQ82R2BVrc5453TYv1BegAVIdPD4cd9LW6Odeea mpcAL2c9lWR4exYHPyNjk1m5Vdvtp9ADs+J2mPvzidXX6LfqZFmSn8fVnreolw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695294551; 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=Okcj2bFzF0xrL1kWAr8oLoEfVReQerFkYZlyXXu2tdc=; b=veKbzCeAx/yxtY+nEOuhuznVK8/x2+rRIKyIssKz9sC5eUYvFMzB6VfhXtvJJuPXCkYDC2 02nrcEFSyp+weDca7Hc1SievslXpE4oWV2twjoRdLQe722yy+Kacmn7tGSBvdTcDBxshAJ Ex/ybaRmWttdd5JXV9TVppHiFO4VMWgqtayj2R43aS7KRt915Ld25Qer5ZljglAPw5lNs7 ZwAlENBPrJyrT6ZlapENOgivXKmrJ6pHw5d48Q9MNviS9eT73S3epqrRQtKr6ppigQxZhW YJRBt6wKAv4+fDxH+wEGbvxfHmcfE9bps/chChiErE3Awq2OYicvsYlo8l/91A== 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 4Rrt2H0fC3zcMR; Thu, 21 Sep 2023 11:09:11 +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 38LB9AnW058685; Thu, 21 Sep 2023 11:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LB95qT058660; Thu, 21 Sep 2023 11:09:05 GMT (envelope-from git) Date: Thu, 21 Sep 2023 11:09:05 GMT Message-Id: <202309211109.38LB95qT058660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 35e5fd1b286c - stable/14 - zfs: merge openzfs/zfs@62677576a (zfs-2.2-release) into stable/14 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35e5fd1b286c18371ec6f66addf678cd4429302c Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=35e5fd1b286c18371ec6f66addf678cd4429302c commit 35e5fd1b286c18371ec6f66addf678cd4429302c Merge: b12c6876b429 62677576a75e Author: Martin Matuska AuthorDate: 2023-09-21 09:29:21 +0000 Commit: Martin Matuska CommitDate: 2023-09-21 09:29:21 +0000 zfs: merge openzfs/zfs@62677576a (zfs-2.2-release) into stable/14 Notable upstream pull request merges: #15274 f7a07d76e Retire z_nr_znodes #15278 62677576a ZIL: Fix potential race on flush deferring #15279 11943656f Update the MOS directory on spa_upgrade_errlog() #15281 54c6fbd37 zed: Allow autoreplace and fault LEDs for removed vdevs Obtained from: OpenZFS OpenZFS commit: 62677576a75e94396e945c4ecd9372f5d34e50cb sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 1 + .../openzfs/cmd/zed/zed.d/statechange-led.sh | 2 +- sys/contrib/openzfs/config/kernel-blkdev.m4 | 84 +++++++++++++++++++++- .../config/kernel-block-device-operations.m4 | 35 ++++++++- .../openzfs/config/kernel-filemap-splice-read.m4 | 25 +++++++ .../openzfs/config/kernel-register_sysctl_table.m4 | 27 +++++++ sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 26 ++++++- sys/contrib/openzfs/config/kernel.m4 | 4 ++ .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 1 - .../include/os/linux/kernel/linux/blkdev_compat.h | 7 ++ sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 12 ++++ .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 1 - sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 8 +-- sys/contrib/openzfs/module/Makefile.in | 2 +- .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 8 +-- .../openzfs/module/os/freebsd/zfs/zfs_znode.c | 2 - sys/contrib/openzfs/module/os/linux/spl/spl-proc.c | 77 ++++++++++++++------ .../openzfs/module/os/linux/zfs/vdev_disk.c | 65 ++++++++++++++--- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 1 - .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 7 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 2 +- .../openzfs/module/os/linux/zfs/zfs_znode.c | 2 - .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 15 ++-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 28 ++++++-- sys/contrib/openzfs/module/zfs/spa_errlog.c | 9 +++ sys/contrib/openzfs/module/zfs/zil.c | 9 +++ .../cli_root/zdb/zdb_block_size_histogram.ksh | 8 +-- 29 files changed, 394 insertions(+), 78 deletions(-) diff --cc sys/contrib/openzfs/config/kernel-filemap-splice-read.m4 index 000000000000,4c83b31d738a..4c83b31d738a mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-filemap-splice-read.m4 +++ b/sys/contrib/openzfs/config/kernel-filemap-splice-read.m4 diff --cc sys/contrib/openzfs/config/kernel-register_sysctl_table.m4 index 000000000000,a5e934f56d29..a5e934f56d29 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-register_sysctl_table.m4 +++ b/sys/contrib/openzfs/config/kernel-register_sysctl_table.m4