git: dd21556857e8 - main - zfs: merge openzfs/zfs@b8e09c700
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Jan 2025 09:31:49 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=dd21556857e8d40f66bf5ad54754d9d52669ebf7
commit dd21556857e8d40f66bf5ad54754d9d52669ebf7
Merge: 3ce003c8b615 b8e09c7007a0
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-01-11 09:00:12 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2025-01-11 09:13:41 +0000
zfs: merge openzfs/zfs@b8e09c700
Notable upstream pull request merges:
#16851 19a04e5ad BRT: Check bv_mos_entries in brt_entry_lookup()
#16854 6c9b4f18d Fix DR_OVERRIDDEN use-after-free race in dbuf_sync_leaf
#16855 fbea92432 flush: don't report flush error when disabling flush
support
#16862 ecc0970e3 backtrace: fix off-by-one on string output
#16864 939e0237c Too many vdev probe errors should suspend pool
#16868 ff6266ee9 Fix use-afer-free regression in RAIDZ expansion
#16871 acda137d8 simd_stat: fix undefined CONFIG_KERNEL_MODE_NEON error
on armel
#16877 219a89cbb Skip iterating over snapshots for share properties
#16881 ab7cbbe78 zprop: fix value help for ZPOOL_PROP_CAPACITY
#16883 f00a57a78 zfs_main: fix alignment on props usage output
#16887 -multiple userprops: make clearing pool & vdev userprops work
the same
#16888 c37a2ddaa microzap: set hard upper limit of 1M
#16890 1acd24696 Fix readonly check for vdev user properties
#16901 9dd5fe109 zvol: implement platform-independent part of block cloning
#16909 54126fdb5 set zfs_arc_shrinker_limit to 0 by default
#16912 25238baad Add missing zfs_exit() when snapdir is disabled
#16918 478b09577 zfs_vnops_os.c: fallocate is valid but not supported
on FreeBSD
#16921 c02e1cf05 vdev_open: clear async remove flag after reopen
#16923 dc0324bfa fix: make zfs_strerror really thread-safe and portable
Obtained from: OpenZFS
OpenZFS commit: b8e09c7007a0733a497aebe734cb8ed23a0415ae
.../.github/workflows/scripts/qemu-2-start.sh | 27 +-
.../.github/workflows/scripts/qemu-3-deps.sh | 2 +-
sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 34 ++-
sys/contrib/openzfs/cmd/zfs/zfs_main.c | 32 +--
.../openzfs/config/kernel-pin-user-pages.m4 | 33 +++
sys/contrib/openzfs/config/kernel-vfs-direct_IO.m4 | 57 -----
sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 72 ++----
sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 -
sys/contrib/openzfs/config/kernel.m4 | 9 +-
sys/contrib/openzfs/config/user.m4 | 2 +-
sys/contrib/openzfs/config/zfs-build.m4 | 4 +-
.../etc/systemd/system/zfs-mount.service.in | 7 +
sys/contrib/openzfs/include/libzutil.h | 15 +-
sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 17 +-
sys/contrib/openzfs/include/sys/zvol_impl.h | 5 +
sys/contrib/openzfs/lib/libspl/backtrace.c | 2 +-
sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 3 +-
sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c | 16 +-
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 3 +-
sys/contrib/openzfs/man/man4/zfs.4 | 4 +-
sys/contrib/openzfs/module/Makefile.in | 2 +
.../openzfs/module/os/freebsd/zfs/vdev_geom.c | 15 --
.../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 +-
sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 4 +-
.../openzfs/module/os/linux/zfs/vdev_disk.c | 5 +-
sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 245 ++++++------------
.../openzfs/module/os/linux/zfs/zfs_vfsops.c | 7 +-
sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 52 +---
sys/contrib/openzfs/module/zcommon/simd_stat.c | 2 +
sys/contrib/openzfs/module/zcommon/zpool_prop.c | 2 +-
sys/contrib/openzfs/module/zfs/brt.c | 3 +
sys/contrib/openzfs/module/zfs/dbuf.c | 3 +-
sys/contrib/openzfs/module/zfs/spa.c | 39 ++-
sys/contrib/openzfs/module/zfs/vdev.c | 3 +-
sys/contrib/openzfs/module/zfs/vdev_raidz.c | 4 +-
sys/contrib/openzfs/module/zfs/zap_micro.c | 18 +-
sys/contrib/openzfs/module/zfs/zfs_vnops.c | 2 +-
sys/contrib/openzfs/module/zfs/zio.c | 11 +-
sys/contrib/openzfs/module/zfs/zvol.c | 284 ++++++++++++++++++++-
sys/contrib/openzfs/rpm/generic/zfs-kmod.spec.in | 4 +-
sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in | 4 +-
sys/contrib/openzfs/scripts/Makefile.am | 2 +-
sys/contrib/openzfs/tests/runfiles/common.run | 10 +-
sys/contrib/openzfs/tests/runfiles/linux.run | 4 +-
.../openzfs/tests/zfs-tests/include/blkdev.shlib | 19 +-
.../openzfs/tests/zfs-tests/tests/Makefile.am | 3 +-
.../cli_root/zfs_mount/zfs_mount_all_fail.ksh | 14 +-
.../zpool_add/zpool_add--allow-ashift-mismatch.ksh | 0
.../cli_root/zpool_import/zpool_import_status.ksh | 7 +-
.../zpool_set/zpool_set_clear_userprop.ksh | 44 ++++
.../cli_root/zpool_set/zpool_set_common.kshlib | 40 ++-
.../functional/fault/suspend_on_probe_errors.ksh | 154 +++++++++++
.../zfs-tests/tests/functional/mount/cleanup.ksh | 4 +-
.../zfs-tests/tests/functional/pam/cleanup.ksh | 2 +-
.../pool_checkpoint/checkpoint_discard_busy.ksh | 9 +-
.../functional/raidz/raidz_expand_001_pos.ksh | 6 +-
.../functional/raidz/raidz_expand_002_pos.ksh | 6 +-
.../functional/raidz/raidz_expand_003_neg.ksh | 2 +-
.../functional/raidz/raidz_expand_003_pos.ksh | 4 +-
.../functional/raidz/raidz_expand_004_pos.ksh | 4 +-
.../functional/raidz/raidz_expand_005_pos.ksh | 4 +-
.../functional/redacted_send/redacted_panic.ksh | 2 +-
.../functional/redundancy/redundancy_draid.ksh | 6 +-
.../redundancy/redundancy_draid_damaged1.ksh | 6 +-
.../redundancy/redundancy_draid_damaged2.ksh | 6 +-
.../functional/redundancy/redundancy_raidz.ksh | 6 +-
66 files changed, 920 insertions(+), 500 deletions(-)
diff --cc sys/contrib/openzfs/config/kernel-pin-user-pages.m4
index 000000000000,fe7aff375208..fe7aff375208
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-pin-user-pages.m4
+++ b/sys/contrib/openzfs/config/kernel-pin-user-pages.m4
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_clear_userprop.ksh
index 000000000000,d9395ea8a15b..d9395ea8a15b
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_clear_userprop.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_clear_userprop.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_on_probe_errors.ksh
index 000000000000,d9261bb5d274..d9261bb5d274
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_on_probe_errors.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_on_probe_errors.ksh