git: 35e5fd1b286c - stable/14 - zfs: merge openzfs/zfs@62677576a (zfs-2.2-release) into stable/14
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Sep 2023 11:09:05 UTC
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 <mm@FreeBSD.org>
AuthorDate: 2023-09-21 09:29:21 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
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