Diffusion FreeBSD src repository 75e1fea68aaa

zfs: merge openzfs/zfs@1147a2797
75e1fea68aaa
Actions

Description

zfs: merge openzfs/zfs@1147a2797

Notable upstream pull request merges:
#16209 --multi-- icp: rip out everything we don't use
#16230 20c8bdd85 FreeBSD: Update use of UMA-related symbols in

arc_available_memory

#16242 121a2d335 FreeBSD: unregister mountroot eventhandler on unload
#16258 5de3ac223 vdev_open: clear async fault flag after reopen
#16270 436731276 zvol: Fix suspend lock leaks
#16273 c87cb22ba head_errlog: fix use-after-free
#16284 f72e081fb FreeBSD: Use a statement expression to implement

SET_ERROR()

#16300 a10faf5ce FreeBSD: Use the new freeuio() helper to free dynamically

allocated UIOs

#16302 a7fc4c85e zstd: don't call zstd_mempool_reap if there are no buffers
#16334 dc91e7452 zdb: dump ZAP_FLAG_UINT64_KEY ZAPs properly

Obtained from: OpenZFS
OpenZFS commit: 1147a279785329a2eaeb01c0610c35fe835a62a6

Details

Provenance

mm	Authored on Jul 18 2024, 7:44 AM

Parents

rG1147a2797853: Fix printf typo for `zfs receive -cv` (#16295)
rGa4469a0d19b6: pipe: convert pipelock flag argument to bool

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG75e1fea68aaa: zfs: merge openzfs/zfs@1147a2797 (authored by mm).Jul 18 2024, 8:02 AM

markj mentioned this in rG2aeb3e204af3: zdb: Chase a missing library dependency.Jul 18 2024, 2:11 PM

Merged Changes

1147a2797853 Fix printf typo for `zfs receive -cv` (#16295)
Author
glibg10b <56197853+glibg10b@users.noreply.github.com>
Browse Repository
No Builds
No Audits
ab6d9bd89a87 Make sure avl_tree.avl_pad is not in kernel module (#16280)
Author
youzhongyang <youzhong@gmail.com>
Browse Repository
No Builds
No Audits
dc91e7452482 zdb: dump ZAP_FLAG_UINT64_KEY ZAPs properly (#16334)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
5de3ac223623 vdev_open: clear async fault flag after reopen
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
393b7ad69522 zts: test single-disk pool resumes properly after disk pull
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
41902c8e6da1 Use kmap_local_page instead of kmap_atomic (#16329)
Author
Jason Lee <jasonlee@lanl.gov>
Browse Repository
No Builds
No Audits
f2ebbe46f6c0 Linux 6.9 compat: META (#16358)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
7ca7bb7fd723 Linux 5.16: use bdev_nr_bytes() to get device capacity
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
e951dba48a63 Linux 6.10: work harder to avoid kmem_cache_alloc reuse
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
b409892ae502 Linux 6.10: rework queue limits setup
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
4ee66cdf4ed4 Add building support for Artix Linux (#16265)
Author
Zhao Yongming <zym@apache.org>
Browse Repository
No Builds
No Audits
a7fc4c85e3ad zstd: don't call zstd_mempool_reap if there are no buffers (#16302)
Author
mjg
Browse Repository
No Builds
No Audits
c87cb22ba9fa head_errlog: fix use-after-free
Author
g_amanakis_yahoo.com
Browse Repository
No Builds
No Audits
f7d8b1333699 Fix missing semicolon in trace_dbuf.h (#16281)
Author
Daniel Berlin <dberlin@dberlin.org>
Browse Repository
No Builds
No Audits
398e675f5839 one-word manpage correction: snapshot->rollback (#16294)
Author
a1ea321 <a1ea321@users.noreply.github.com>
Browse Repository
No Builds
No Audits
cbd95a950aa5 ZTS: handle FreeBSD version numbers correctly (#16340)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
a10faf5ce6fe FreeBSD: Use the new freeuio() helper to free dynamically allocated UIOs…
Author
markj
Browse Repository
No Builds
No Audits
156a64161b4f Linux 6.9: Fix UBSAN errors in zap_micro.c
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
436731276061 zvol: Fix suspend lock leaks (#16270)
Author
markj
Browse Repository
No Builds
No Audits
326040b28525 Fix the name of the zfs_prefetch_disable parameter (#16319)
Author
Peter Doherty <peterd@acranox.org>
Browse Repository
No Builds
No Audits
9ffe4413610e Fix zdb "Memory fault" found on FreeBSD ZTS (#16332)
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
f72e081fbf38 FreeBSD: Use a statement expression to implement SET_ERROR() (#16284)
Author
markj
Browse Repository
No Builds
No Audits
fd51786f86e4 zfs.4: Document the actual default for zfs_txg_history (#16305)
Author
0mp
Browse Repository
No Builds
No Audits
5f220c62e1c2 Fix a mis-merge in the zdb man page (#16304)
Author
allanjude
Browse Repository
No Builds
No Audits
49f3ce338587 Linux 6.9: Call add_disk() from workqueue to fix zfs_allow_010_pos (#16282)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
c98295eed268 disable automatic dependency tracking for dkms builds
Author
Martin Wagner <martin.wagner.dev@gmail.com>
Browse Repository
No Builds
No Audits
121a2d335414 FreeBSD: unregister mountroot eventhandler on unload
Author
mjg
Browse Repository
No Builds
No Audits
20c8bdd85ef4 FreeBSD: Update use of UMA-related symbols in arc_available_memory
Author
bnovkov
Browse Repository
No Builds
No Audits
4de260efe337 contrib/bash_completion.d: squelch FreeBSD seq when first < last
Author
dereks_lifeofadishwasher.com
Browse Repository
No Builds
No Audits
b558f0a9d65c zdb: fix FreeBSD build failure
Author
Ameer Hamza <ahamza@ixsystems.com>
Browse Repository
No Builds
No Audits
23a489a41167 zdb: detect cachefile automatically otherwise force import
Author
Ameer Hamza <ahamza@ixsystems.com>
Browse Repository
No Builds
No Audits
a72751a34265 icp: remove redundant FreeBSD check
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
4e714c0be10f icp: remove unused headers
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
ae512620d0c3 icp: remove skein module
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
f39241aeb333 icp: remove unused SHA2 HMAC mechanisms
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
10de12e9ed2f icp: reorganise SHA2 digest mechanisms
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
1291c46ea4ba icp: remove digest entry points
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
94f1e56e4129 icp: remove unused KCF_ macros
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
4ed91dc26e63 icp: remove unusued incremental cipher methods
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
57249bcddc0d icp: brutally remove unused AES modes
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
4185179190f3 icp: remove unused blowfish_ctx and des_ctx
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
a301dc364c33 ZTS: Fix redacted_send failures on FreeBSD
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits

Changes (70)

Path

Size

cddl/

lib/

libicp/

Makefile

libicp_rescue/

Makefile

sys/

contrib/

openzfs/

zfs: merge openzfs/zfs@1147a279775e1fea68aaaActions

Description

Details

Event Timeline

Merged Changes

Changes (70)

rG75e1fea68aaa

cddl/lib/libicp/Makefile

cddl/lib/libicp_rescue/Makefile

sys/contrib/openzfs/META

sys/contrib/openzfs/cmd/zdb/zdb.c

sys/contrib/openzfs/config/kernel-blk-queue.m4

sys/contrib/openzfs/config/kernel-blkdev.m4

sys/contrib/openzfs/config/kernel-kmap-local-page.m4

sys/contrib/openzfs/config/kernel.m4

sys/contrib/openzfs/config/zfs-build.m4

sys/contrib/openzfs/contrib/bash_completion.d/zfs.in

sys/contrib/openzfs/include/libzfs_core.h

sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h

sys/contrib/openzfs/include/os/linux/kernel/linux/kmap_compat.h

sys/contrib/openzfs/include/os/linux/spl/sys/kmem_cache.h

sys/contrib/openzfs/include/os/linux/zfs/sys/trace_dbuf.h

sys/contrib/openzfs/include/sys/avl_impl.h

sys/contrib/openzfs/include/sys/crypto/common.h

sys/contrib/openzfs/include/sys/crypto/icp.h

sys/contrib/openzfs/include/sys/sha2.h

sys/contrib/openzfs/include/sys/skein.h

sys/contrib/openzfs/include/sys/spa.h

sys/contrib/openzfs/lib/libicp/Makefile.am

sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c

sys/contrib/openzfs/man/man4/zfs.4

sys/contrib/openzfs/man/man7/dracut.zfs.7

sys/contrib/openzfs/man/man7/zfsprops.7

sys/contrib/openzfs/man/man8/zdb.8

sys/contrib/openzfs/module/Kbuild.in

sys/contrib/openzfs/module/icp/algs/aes/aes_modes.c

sys/contrib/openzfs/module/icp/algs/modes/cbc.c

sys/contrib/openzfs/module/icp/algs/modes/ctr.c

sys/contrib/openzfs/module/icp/algs/modes/ecb.c

sys/contrib/openzfs/module/icp/algs/modes/gcm.c

sys/contrib/openzfs/module/icp/algs/modes/modes.c

sys/contrib/openzfs/module/icp/algs/sha2/sha2_generic.c

sys/contrib/openzfs/module/icp/core/kcf_mech_tabs.c

sys/contrib/openzfs/module/icp/illumos-crypto.c

sys/contrib/openzfs/module/icp/include/aes/aes_impl.h

sys/contrib/openzfs/module/icp/include/modes/modes.h

sys/contrib/openzfs/module/icp/include/sys/crypto/impl.h

sys/contrib/openzfs/module/icp/include/sys/crypto/spi.h

sys/contrib/openzfs/module/icp/include/sys/stack.h

sys/contrib/openzfs/module/icp/include/sys/trap.h

sys/contrib/openzfs/module/icp/io/aes.c

sys/contrib/openzfs/module/icp/io/sha2_mod.c

sys/contrib/openzfs/module/icp/io/skein_mod.c

sys/contrib/openzfs/module/os/freebsd/spl/spl_uio.c

sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c

sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c

sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c

sys/contrib/openzfs/module/os/linux/spl/spl-kmem-cache.c

sys/contrib/openzfs/module/os/linux/zfs/abd_os.c

sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c

sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c

sys/contrib/openzfs/module/zfs/dsl_dataset.c

sys/contrib/openzfs/module/zfs/vdev.c

sys/contrib/openzfs/scripts/dkms.mkconf

sys/contrib/openzfs/tests/runfiles/linux.run

sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in

sys/contrib/openzfs/tests/zfs-tests/cmd/checksum/sha2_test.c

sys/contrib/openzfs/tests/zfs-tests/include/libtest.shlib

sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_resume_single.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_deleted.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_mounts.ksh

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h

zfs: merge openzfs/zfs@1147a2797
75e1fea68aaa
Actions