From nobody Tue Nov 18 12:58:51 2025 X-Original-To: dev-commits-src-branches@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 4d9l6h5fwqz6H5jZ for ; Tue, 18 Nov 2025 12:58:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9l6h3hLjz3gpl for ; Tue, 18 Nov 2025 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470732; 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=qtcqyzCt7xtCaosDO5cGzEmpBq9L459PwHyNGnhP568=; b=tLt/kFFzVFa6L9KzcNHmYSxYYqzY5SZO/HDUfrhgEfxZAnKoq7fPVe2wAPuP7pGLcwY5hc QM1FcfK2tuYg3TCrRz9qFNHXD2SALgZIht1af/NHvp4g0mME9UOm/tx6wf3w0MLTWzKpH8 JUPgBUQbqLNT5UiBk2WxCycHGLMtMLuTSeDC2tzlbEeTi26ZQyeDsYeBl4RtD4WWD6tp8s TIof2cnmbgZCBHKoQ0ZrhOCu1hMqK6fFY5Vt47GCtKMs6yymXuXp1ypr1FiapkhY2kA04w 0vCswAbDKVb3CIgZ/owkazQJD2A/rEtw4UHjSV3sUtKFvSF3am56iVQkhIyasQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470732; 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=qtcqyzCt7xtCaosDO5cGzEmpBq9L459PwHyNGnhP568=; b=d9XTOf89sROobAGCNF3Q7AtnnsdrHiKnPBqd01TJ56NLEaOjAB9YvR9YLBlXJbqV+jMzHv JbbPeAN1I2oNoxuHozqWFJFhgY9x3ssRhilnL+mOYHz5/mGazHxo6ua00hE2D5CVnAlwK2 orbjRzMG7xbGVfPAxlBd1CO8/ePdFRA/p7YbtZKtZQ+vBmVQd+kft+K+T8UBTNJmlTU5Mz NBmYZYStdkKhR9gp8k+oCesPDdKaHLaGZznuD6iLUDly4aa9ajIeTbcbHNZgnIzLdvOhdm QuFVd5A8B0geawon2qhcn4tzSbyZCS5W34s0OoIW1BeiSeVKjxj5ZIL0ukTE3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763470732; a=rsa-sha256; cv=none; b=uvnFJn2bT5t17gQSwA+pN8oFc6iaZT/2tyDw/ghQx9DhvYUk8sTHMe04ji+wmJO3yU4U5A rlLHHNdWt9DfjIPHhtkQvbdHDXuMr48T3RlMdu/tYCNt8R5ZSyKgCAhQtGNEM4hlNnCuLx VKiDuv2huvqdTKJsN70e9YF/zVVibnVqluT8vYlOesBEsUP7v9iDuGhOGg3Om7OmUltybg e94vLS7vF05ulsEU/w4iTFTV3/VNPMUtPOiy3Efa/ER6DX7Nrc7EbqUnmNbytG4oZ+gSEp LGD8oo92C+6E78GmtSfq4C3M8hv+jTume0xHACqi2f9jArlet3gwONeKfeVyVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6h2y1Wzvl6 for ; Tue, 18 Nov 2025 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c400 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 12:58:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 155d5b8a19ba - stable/15 - zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 155d5b8a19baa864ebe9d8346d932bd04ea23aca Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 12:58:51 +0000 Message-Id: <691c6d8b.2c400.75b41508@gitrepo.freebsd.org> 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 AuthorDate: 2025-11-18 11:44:03 +0000 Commit: Martin Matuska 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 Name +# Canonical Name Commit Name +# +# 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 +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee +Diwakar Kristappagari +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang +Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska ++Jo Zzsi +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K +Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis ++Roberto Ricci +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Sebastian Wuerl +SHENGYI HONG +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + +# Signed-off-by: overriding Author: +Alexander Ziaee +Felix Schmidt ++Jean-Sébastien Pédron ++Konstantin Belousov +Olivier Certner ++Patrick Xia +Phil Sutter +poscat +Qiuhao Chen +Ryan +Sietse +Yuxin Wang +Zhenlei Huang + +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk +Aleksandr Liber <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh +Chris Peredun <126915832+chrisperedun@users.noreply.github.com> ++classabbyamp <5366828+classabbyamp@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley +Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan +Friedrich Weber <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx +Germano Massullo +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill +Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran +Justin Hibbits +Kaitlin Hoang +Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> ++nav1s <42621369+nav1s@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan ++Shreshth Srivastava <66148173+Shreshth3@users.noreply.github.com> +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +XDTG <35128600+XDTG@users.noreply.github.com> +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <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 @@@ +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png) + +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. + +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs) +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](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.ksh