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 <[email protected]> AuthorDate: 2025-11-18 11:44:03 +0000 Commit: Martin Matuska <[email protected]> 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 <[email protected]> +Ahelenia Ziemiańska <[email protected]> +Ahelenia Ziemiańska <[email protected]> +Alex John <[email protected]> +Andreas Dilger <[email protected]> +Andrew Walker <[email protected]> +Benedikt Neuffer <[email protected]> +Chengfei Zhu <[email protected]> +ChenHao Lu <[email protected]> +Chris Lindee <[email protected]> +Colm Buckley <[email protected]> +Crag Wang <[email protected]> +Damian Szuberski <[email protected]> +Daniel Kolesa <[email protected]> +Debabrata Banerjee <[email protected]> +Diwakar Kristappagari <[email protected]> +Finix Yan <[email protected]> +Gaurav Kumar <[email protected]> +Gionatan Danti <[email protected]> +Glenn Washburn <[email protected]> +Gordan Bobic <[email protected]> +Gregory Bartholomew <[email protected]> +hedong zhang <[email protected]> +Ilkka Sovanto <[email protected]> +InsanePrawn <[email protected]> +Jason Cohen <[email protected]> +Jason Harmening <[email protected]> +Jeremy Faulkner <[email protected]> +Jinshan Xiong <[email protected]> +John Poduska <[email protected]> ++Jo Zzsi <[email protected]> +Justin Scholz <[email protected]> +Ka Ho Ng <[email protected]> +Kash Pande <[email protected]> +Kay Pedersen <[email protected]> +KernelOfTruth <[email protected]> +Liu Hua <[email protected]> +Liu Qing <[email protected]> +loli10K <[email protected]> +Mart Frauenlob <[email protected]> +Matthias Blankertz <[email protected]> +Michael Gmelin <[email protected]> +Olivier Mazouffre <[email protected]> +Piotr Kubaj <[email protected]> +Quentin Zdanis <[email protected]> ++Roberto Ricci <[email protected]> +Roberto Ricci <[email protected]> +Rob Norris <[email protected]> +Rob Norris <[email protected]> +Sam Lunt <[email protected]> +Sanjeev Bagewadi <[email protected]> +Sebastian Wuerl <[email protected]> +SHENGYI HONG <[email protected]> +Stoiko Ivanov <[email protected]> +Tamas TEVESZ <[email protected]> +WHR <[email protected]> +Yanping Gao <[email protected]> +Youzhong Yang <[email protected]> + +# Signed-off-by: overriding Author: +Alexander Ziaee <[email protected]> <[email protected]> +Felix Schmidt <[email protected]> <[email protected]> ++Jean-Sébastien Pédron <[email protected]> <[email protected]> ++Konstantin Belousov <[email protected]> <[email protected]> +Olivier Certner <[email protected]> <[email protected]> ++Patrick Xia <[email protected]> <[email protected]> +Phil Sutter <[email protected]> <[email protected]> +poscat <[email protected]> <[email protected]> +Qiuhao Chen <[email protected]> <[email protected]> +Ryan <[email protected]> <[email protected]> +Sietse <[email protected]> <[email protected]> +Yuxin Wang <[email protected]> <[email protected]> +Zhenlei Huang <[email protected]> <[email protected]> + +# Commits from strange places, long ago +Brian Behlendorf <[email protected]> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> +Brian Behlendorf <[email protected]> <behlendo@fedora-17-amd64.(none)> +Brian Behlendorf <[email protected]> <behlendo@myhost.(none)> +Brian Behlendorf <[email protected]> <[email protected]> +Brian Behlendorf <[email protected]> <[email protected]> +Herb Wartens <[email protected]> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> +Ned Bass <[email protected]> <bass6@zeno1.(none)> +Tulsi Jain <[email protected]> <[email protected]> + +# Mappings from Github no-reply addresses +ajs124 <[email protected]> <[email protected]> +Alek Pinchuk <[email protected]> <[email protected]> +Aleksandr Liber <[email protected]> <[email protected]> +Alexander Lobakin <[email protected]> <[email protected]> +Alexey Smirnoff <[email protected]> <[email protected]> +Allen Holl <[email protected]> <[email protected]> +Alphan Yılmaz <[email protected]> <[email protected]> +Ameer Hamza <[email protected]> <[email protected]> +Andrew J. Hesford <[email protected]> <[email protected]>> +Andrew Sun <[email protected]> <[email protected]> +Aron Xu <[email protected]> <[email protected]> +Arun KV <[email protected]> <[email protected]> +Ben Wolsieffer <[email protected]> <[email protected]> +bernie1995 <[email protected]> <[email protected]> +Bojan Novković <[email protected]> <[email protected]> +Boris Protopopov <[email protected]> <[email protected]> +Brad Forschinger <[email protected]> <[email protected]> +Brandon Thetford <[email protected]> <[email protected]> +buzzingwires <[email protected]> <[email protected]> +Cedric Maunoury <[email protected]> <[email protected]> +Charles Suh <[email protected]> <[email protected]> +Chris Peredun <[email protected]> <[email protected]> ++classabbyamp <[email protected]> <[email protected]> +Dacian Reece-Stremtan <[email protected]> <[email protected]> +Damian Szuberski <[email protected]> <[email protected]> +Daniel Hiepler <[email protected]> <[email protected]> +Daniel Kobras <[email protected]> <[email protected]> +Daniel Reichelt <[email protected]> <[email protected]> +David Quigley <[email protected]> <[email protected]> +Dennis R. Friedrichsen <[email protected]> <[email protected]> +Dex Wood <[email protected]> <[email protected]> +DHE <[email protected]> <[email protected]> +Dmitri John Ledkov <[email protected]> <[email protected]> +Dries Michiels <[email protected]> <[email protected]> +Edmund Nadolski <[email protected]> <[email protected]> +Érico Nogueira <[email protected]> <[email protected]> +Fedor Uporov <[email protected]> <[email protected]> +Felix Dörre <[email protected]> <[email protected]> +Felix Neumärker <[email protected]> <[email protected]> +Finix Yan <[email protected]> <[email protected]> +Friedrich Weber <[email protected]> <[email protected]> +Gaurav Kumar <[email protected]> <[email protected]> +George Gaydarov <[email protected]> <[email protected]> +Georgy Yakovlev <[email protected]> <[email protected]> +Gerardwx <[email protected]> <[email protected]> +Germano Massullo <[email protected]> <[email protected]> +Gian-Carlo DeFazio <[email protected]> <[email protected]> +Giuseppe Di Natale <[email protected]> <[email protected]> +Hajo Möller <[email protected]> <[email protected]> +Harry Mallon <[email protected]> <[email protected]> +Hiếu Lê <[email protected]> <[email protected]> +Jake Howard <[email protected]> <[email protected]> +James Cowgill <[email protected]> <[email protected]> +Jaron Kent-Dobias <[email protected]> <[email protected]> +Jason King <[email protected]> <[email protected]> +Jeff Dike <[email protected]> <[email protected]> +Jitendra Patidar <[email protected]> <[email protected]> +João Carlos Mendes Luís <[email protected]> <[email protected]> +John Eismeier <[email protected]> <[email protected]> +John L. Hammond <[email protected]> <[email protected]> +John-Mark Gurney <[email protected]> <[email protected]> +John Ramsden <[email protected]> <[email protected]> +Jonathon Fernyhough <[email protected]> <[email protected]> +Jose Luis Duran <[email protected]> <[email protected]> +Justin Hibbits <[email protected]> <[email protected]> +Kaitlin Hoang <[email protected]> <[email protected]> +Kevin Greene <[email protected]> <[email protected]> +Kevin Jin <[email protected]> <[email protected]> +Kevin P. Fleming <[email protected]> <[email protected]> +Krzysztof Piecuch <[email protected]> <[email protected]> +Kyle Evans <[email protected]> <[email protected]> +Laurențiu Nicola <[email protected]> <[email protected]> +loli10K <[email protected]> <[email protected]> +Lorenz Hüdepohl <[email protected]> <[email protected]> +Luís Henriques <[email protected]> <[email protected]> +Marcin Skarbek <[email protected]> <[email protected]> +Matt Fiddaman <[email protected]> <[email protected]> +Maxim Filimonov <[email protected]> <[email protected]> +Max Zettlmeißl <[email protected]> <[email protected]> +Michael Niewöhner <[email protected]> <[email protected]> +Michael Zhivich <[email protected]> <[email protected]> +MigeljanImeri <[email protected]> <[email protected]> +Mo Zhou <[email protected]> <[email protected]> ++nav1s <[email protected]> <[email protected]> +Nick Mattis <[email protected]> <[email protected]> +omni <[email protected]> <[email protected]> +Pablo Correa Gómez <[email protected]> <[email protected]> +Paul Zuchowski <[email protected]> <[email protected]> +Peter Ashford <[email protected]> <[email protected]> +Peter Dave Hello <[email protected]> <[email protected]> +Peter Wirdemo <[email protected]> <[email protected]> +Petros Koutoupis <[email protected]> <[email protected]> +Ping Huang <[email protected]> <[email protected]> +Piotr P. Stefaniak <[email protected]> <[email protected]> +Richard Allen <[email protected]> <[email protected]> +Rich Ercolani <[email protected]> <[email protected]> +Rick Macklem <[email protected]> <[email protected]> +Rob Wing <[email protected]> <[email protected]> +Roman Strashkin <[email protected]> <[email protected]> +Ryan Hirasaki <[email protected]> <[email protected]> +Samuel Wycliffe J <[email protected]> <[email protected]> +Samuel Wycliffe <[email protected]> <[email protected]> +Savyasachee Jha <[email protected]> <[email protected]> +Scott Colby <[email protected]> <[email protected]> +Sean Eric Fagan <[email protected]> <[email protected]> ++Shreshth Srivastava <[email protected]> <[email protected]> +Spencer Kinny <[email protected]> <[email protected]> +Srikanth N S <[email protected]> <[email protected]> +Stefan Lendl <[email protected]> <[email protected]> +Thomas Bertschinger <[email protected]> <[email protected]> +Thomas Geppert <[email protected]> <[email protected]> +Tim Crawford <[email protected]> <[email protected]> +Todd Seidelmann <[email protected]> +Tom Matthews <[email protected]> <[email protected]> +Tony Perkins <[email protected]> <[email protected]> +Torsten Wörtwein <[email protected]> <[email protected]> +Tulsi Jain <[email protected]> <[email protected]> +Václav Skála <[email protected]> <[email protected]> +Vaibhav Bhanawat <[email protected]> <[email protected]> +Vandana Rungta <[email protected]> <[email protected]> +Violet Purcell <[email protected]> <[email protected]> +Vipin Kumar Verma <[email protected]> <[email protected]> +Wolfgang Bumiller <[email protected]> <[email protected]> +XDTG <[email protected]> <[email protected]> +xtouqh <[email protected]> <[email protected]> +Yuri Pankov <[email protected]> <[email protected]> +Yuri Pankov <[email protected]> <[email protected]> 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.ksh
