Date: Tue, 18 Nov 2025 12:58:51 +0000 From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 155d5b8a19ba - stable/15 - zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 Message-ID: <691c6d8b.2c400.75b41508@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=155d5b8a19baa864ebe9d8346d932bd04ea23aca commit 155d5b8a19baa864ebe9d8346d932bd04ea23aca Merge: 48c288443822 099f69ff5d3d Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2025-11-18 11:44:03 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2025-11-18 11:44:03 +0000 zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 OpenZFS 2.4.0 rc4 Notable upstream pull request merges: #17477 1e8c96d7d Add knob to disable slow io notifications #17792 5582e8b08 Update dnode_next_offset_level to accept blkid instead of offset #17872 584762617 Pass flags to more DMU write/hold functions #17875 178a8be21 BRT: Round bv_entcount up to BRT_BLOCKSIZE #17875 e3acd0a72 Fix caching of DDT log and BRT #17877 67fc49433 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage #17824 dda711dbb Fix gang write late_arrival bug #17890 41878d57e Add BRT support to zpool prefetch command #17903 aaf374bd4 ZIO: Set minimum number of free issue threads to 32 #17906 ac0bc4cc0 spa_misc: add an API for spa_namespace_lock #17908 583db4003 FreeBSD: Add support for _PC_CASE_INSENSITIVE #17911 -multiple Update library ABI versions for v2.4.0 #17915 e305c7d59 BRT: Fix ranges to blocks conversion math #17916 002bc3da6 BRT: Increase block size from 4KB to 8KB #17921 e895c7619 ZAP: Remove dmu_object_info_from_dnode() call Obtained from: OpenZFS OpenZFS commit: 099f69ff5d3df7988632039db7ad6d183eb34042 OpenZFS tag: zfs-2.4.0-rc4 .../.github/workflows/scripts/generate-ci-type.py | 10 +- .../.github/workflows/scripts/qemu-2-start.sh | 20 +- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 38 ++- sys/contrib/openzfs/.mailmap | 8 + sys/contrib/openzfs/AUTHORS | 14 + sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/autogen.sh | 61 +---- sys/contrib/openzfs/cmd/zdb/zdb.c | 8 +- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 ++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 34 ++- sys/contrib/openzfs/cmd/ztest.c | 39 +-- sys/contrib/openzfs/config/deb.am | 8 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 8 +- sys/contrib/openzfs/contrib/debian/clean | 4 +- sys/contrib/openzfs/contrib/debian/control | 26 +- .../{openzfs-libzfs6.docs => openzfs-libzfs7.docs} | 0 ...bzfs6.install.in => openzfs-libzfs7.install.in} | 0 ...enzfs-libzpool6.docs => openzfs-libzpool7.docs} | 0 ...ol6.install.in => openzfs-libzpool7.install.in} | 0 .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/dmu.h | 8 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 14 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libnvpair/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 +++ .../openzfs/lib/libspl/include/sys/tunables.h | 12 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 69 ----- sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 83 +----- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 2 + sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 5 +- .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 37 +++ .../openzfs/lib/libzfs_core/libzfs_core.abi | 70 +---- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 2 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzpool/kernel.c | 4 +- sys/contrib/openzfs/man/man4/zfs.4 | 42 ++- sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 + sys/contrib/openzfs/man/man8/zfs-jail.8 | 79 +++--- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 22 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 73 ++++-- sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 27 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 24 -- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 5 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 10 +- .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 20 +- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 2 + .../openzfs/module/os/freebsd/zfs/zvol_os.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 93 +++++-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 8 +- sys/contrib/openzfs/module/zfs/bpobj.c | 7 +- sys/contrib/openzfs/module/zfs/bptree.c | 9 +- sys/contrib/openzfs/module/zfs/brt.c | 48 +++- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 7 +- sys/contrib/openzfs/module/zfs/dmu.c | 27 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dnode.c | 156 +++++------- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/mmp.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 281 +++++++++++++-------- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 2 +- sys/contrib/openzfs/module/zfs/spa_config.c | 8 +- sys/contrib/openzfs/module/zfs/spa_history.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 110 +++++--- sys/contrib/openzfs/module/zfs/space_map.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 86 +++++-- .../openzfs/module/zfs/vdev_indirect_births.c | 2 +- .../openzfs/module/zfs/vdev_indirect_mapping.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 33 +-- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 20 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 12 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 9 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 41 +-- sys/contrib/openzfs/module/zfs/zio.c | 13 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 8 +- sys/contrib/openzfs/module/zfs/zvol.c | 9 +- .../openzfs/module/zstd/include/aarch64_compat.h | 38 --- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 44 ++-- sys/contrib/openzfs/scripts/Makefile.am | 4 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 4 + sys/contrib/openzfs/scripts/zfs2zol-patch.sed | 32 --- sys/contrib/openzfs/scripts/zol2zfs-patch.sed | 20 -- sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../tests/test-runner/bin/test-runner.py.in | 33 ++- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../zpool_prefetch/zpool_prefetch_001_pos.ksh | 12 +- .../zpool_prefetch/zpool_prefetch_002_pos.ksh | 95 +++++++ .../tests/functional/events/zed_slow_io.ksh | 44 +++- .../tests/functional/trim/autotrim_config.ksh | 2 +- 115 files changed, 1386 insertions(+), 1059 deletions(-) diff --cc sys/contrib/openzfs/.mailmap index e6f09c6c9d43,000000000000..3397fbc3745d mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,229 -1,0 +1,237 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name <canonical-email> +# Canonical Name <canonical-email> <commit-email> +# Canonical Name <canonical-email> Commit Name <commit-email> +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. +Achill Gilgenast <achill@achill.org> +Ahelenia Ziemiańska <nabijaczleweli@gmail.com> +Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> +Alex John <alex@stty.io> +Andreas Dilger <adilger@dilger.ca> +Andrew Walker <awalker@ixsystems.com> +Benedikt Neuffer <github@itfriend.de> +Chengfei Zhu <chengfeix.zhu@intel.com> +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee <chris.lindee+github@gmail.com> +Colm Buckley <colm@tuatha.org> +Crag Wang <crag0715@gmail.com> +Damian Szuberski <szuberskidamian@gmail.com> +Daniel Kolesa <daniel@octaforge.org> +Debabrata Banerjee <dbavatar@gmail.com> +Diwakar Kristappagari <diwakar-k@hpe.com> +Finix Yan <yanchongwen@hotmail.com> +Gaurav Kumar <gauravk.18@gmail.com> +Gionatan Danti <g.danti@assyoma.it> +Glenn Washburn <development@efficientek.com> +Gordan Bobic <gordan.bobic@gmail.com> +Gregory Bartholomew <gregory.lee.bartholomew@gmail.com> +hedong zhang <h_d_zhang@163.com> +Ilkka Sovanto <github@ilkka.kapsi.fi> +InsanePrawn <Insane.Prawny@gmail.com> +Jason Cohen <jwittlincohen@gmail.com> +Jason Harmening <jason.harmening@gmail.com> +Jeremy Faulkner <gldisater@gmail.com> +Jinshan Xiong <jinshan.xiong@gmail.com> +John Poduska <jpoduska@datto.com> ++Jo Zzsi <jozzsicsataban@gmail.com> +Justin Scholz <git@justinscholz.de> +Ka Ho Ng <khng300@gmail.com> +Kash Pande <github@tripleback.net> +Kay Pedersen <christianpe96@gmail.com> +KernelOfTruth <kerneloftruth@gmail.com> +Liu Hua <liu.hua130@zte.com.cn> +Liu Qing <winglq@gmail.com> +loli10K <ezomori.nozomu@gmail.com> +Mart Frauenlob <allkind@fastest.cc> +Matthias Blankertz <matthias@blankertz.org> +Michael Gmelin <grembo@FreeBSD.org> +Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr> +Piotr Kubaj <pkubaj@anongoth.pl> +Quentin Zdanis <zdanisq@gmail.com> ++Roberto Ricci <io@r-ricci.it> +Roberto Ricci <ricci@disroot.org> +Rob Norris <robn@despairlabs.com> +Rob Norris <rob.norris@klarasystems.com> +Sam Lunt <samuel.j.lunt@gmail.com> +Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com> +Sebastian Wuerl <s.wuerl@mailbox.org> +SHENGYI HONG <aokblast@FreeBSD.org> +Stoiko Ivanov <github@nomore.at> +Tamas TEVESZ <ice@extreme.hu> +WHR <msl0000023508@gmail.com> +Yanping Gao <yanping.gao@xtaotech.com> +Youzhong Yang <youzhong@gmail.com> + +# Signed-off-by: overriding Author: +Alexander Ziaee <ziaee@FreeBSD.org> <concussious@runbox.com> +Felix Schmidt <felixschmidt20@aol.com> <f.sch.prototype@gmail.com> ++Jean-Sébastien Pédron <dumbbell@FreeBSD.org> <jean-sebastien.pedron@dumbbell.fr> ++Konstantin Belousov <kib@FreeBSD.org> <kib@kib.kiev.ua> +Olivier Certner <olce@FreeBSD.org> <olce.freebsd@certner.fr> ++Patrick Xia <patrickx@google.com> <octalc0de@aim.com> +Phil Sutter <phil@nwl.cc> <p.github@nwl.cc> +poscat <poscat@poscat.moe> <poscat0x04@outlook.com> +Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com> +Ryan <errornointernet@envs.net> <error.nointernet@gmail.com> +Sietse <sietse@wizdom.nu> <uglymotha@wizdom.nu> +Yuxin Wang <yuxinwang9999@gmail.com> <Bi11gates9999@gmail.com> +Zhenlei Huang <zlei@FreeBSD.org> <zlei.huang@gmail.com> + +# Commits from strange places, long ago +Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> +Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)> +Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)> +Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal> +Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal> +Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> +Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)> +Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local> + +# Mappings from Github no-reply addresses +ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com> +Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com> +Aleksandr Liber <aleksandr.liber@perforce.com> <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com> +Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com> +Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz <alphanyilmaz@gmail.com> <a1ea321@users.noreply.github.com> +Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>> +Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com> +Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com> +Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com> +bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <bnovkov@FreeBSD.org> <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com> +Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com> +Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com> +buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com> +Chris Peredun <chris.peredun@ixsystems.com> <126915832+chrisperedun@users.noreply.github.com> ++classabbyamp <dev@placeviolette.net> <5366828+classabbyamp@users.noreply.github.com> +Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com> +Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com> +Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com> +David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com> +Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com> <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood <slash2314@gmail.com> <slash2314@users.noreply.github.com> +DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com> +Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com> +Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com> +Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com> +Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com> +Friedrich Weber <f.weber@proxmox.com> <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com> +George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com> +Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com> +Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com> +Germano Massullo <germano.massullo@gmail.com> <Germano0@users.noreply.github.com> +Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com> +Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com> +Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com> +Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com> +Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com> +James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com> +Jaron Kent-Dobias <jaron@kent-dobias.com> <kentdobias@users.noreply.github.com> +Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com> +Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís <jonny@jonny.eng.br> <dioni21@users.noreply.github.com> +John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com> +John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com> +Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com> +Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com> +Kaitlin Hoang <kthoang@amazon.com> <khoang98@users.noreply.github.com> +Kevin Greene <kevin.greene@delphix.com> <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com> +Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com> +Laurențiu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com> +loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com> +Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com> +Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com> +Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov <che@bein.link> <part1zano@users.noreply.github.com> +Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com> +Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com> +Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <ImeriMigel@gmail.com> <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com> ++nav1s <nav1s@proton.me> <42621369+nav1s@users.noreply.github.com> +Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com> +omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com> +Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com> +Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com> +Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com> +Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com> +Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com> +Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com> +Rick Macklem <rmacklem@uoguelph.ca> <64620010+rmacklem@users.noreply.github.com> +Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com> +Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com> +Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com> +Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com> +Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com> ++Shreshth Srivastava <shreshthsrivastava2@gmail.com> <66148173+Shreshth3@users.noreply.github.com> +Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <s.lendl@proxmox.com> <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <bertschinger@lanl.gov> <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com> +Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com> +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com> +Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com> +Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com> +Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <vrungta@amazon.com> <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com> +XDTG <click1799@163.com> <35128600+XDTG@users.noreply.github.com> +xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/README.md index a90736bb56b7,000000000000..a39b88fedd12 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,35 @@@ + + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[](https://codecov.io/gh/openzfs/zfs) +[](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo - * [ZoL Site](https://zfsonlinux.org) - Linux release info & links ++ * [ZoL site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + +# Supported Kernels + * The `META` file contains the officially recognized supported Linux kernel versions. + * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE. diff --cc sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h index 000000000000,c7b567ff44a4..c7b567ff44a4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh index 000000000000,f34f8c36e592..f34f8c36e592 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.kshhelp
](https://codecov.io/gh/openzfs/zfs){kind=link}
](https://scan.coverity.com/projects/openzfs-zfs){kind=link}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?691c6d8b.2c400.75b41508>