git: 3747329b7864 - main - zfs: merge openzfs/zfs@e8e602d98

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Martin Matuska <mm_at_FreeBSD.org>
Date: Sat, 31 May 2025 13:44:06 UTC
The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=3747329b7864d0f98a0e34dda0113804ab3a2dce

commit 3747329b7864d0f98a0e34dda0113804ab3a2dce
Merge: d00a98d639ca e8e602d987b0
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-05-31 15:41:12 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2025-05-31 15:41:12 +0000

    zfs: merge openzfs/zfs@e8e602d98
    
    Notable upstream pull request merges:
     #17381 44e326689 events: include zio type in IO error reports
     #17395 008c9666e Set spa_final_txg in spa_unload()
     #17394 1bd225ed8 abd_os: move headers from libzpool to libspl
     #17399 5764e218b vdev_disk: remove classic IO submission
     #17400 b3b3cd1e4 vdev: skip faulting disks pending removal
     #17406 a38376b37 Rename zvol kernel module parameters sysctls on FreeBSD side
     #17407 2d33c8edb Make rewrite use Uncached I/O
    
    Obtained from:  OpenZFS
    OpenZFS commit: e8e602d987b01e7940f698d5fa2b00754609c74b

 .../.github/workflows/scripts/qemu-2-start.sh      |  15 +-
 .../.github/workflows/scripts/qemu-3-deps-vm.sh    |   6 +-
 .../.github/workflows/scripts/qemu-4-build-vm.sh   |   2 +-
 .../.github/workflows/scripts/qemu-6-tests.sh      |   7 +
 .../.github/workflows/zfs-qemu-packages.yml        |   2 +-
 sys/contrib/openzfs/.github/workflows/zfs-qemu.yml |   8 +-
 sys/contrib/openzfs/cmd/zpool/zpool_main.c         |  12 +-
 sys/contrib/openzfs/config/Rules.am                |   3 +-
 sys/contrib/openzfs/include/sys/fm/fs/zfs.h        |   1 +
 sys/contrib/openzfs/include/sys/zio.h              |   1 -
 sys/contrib/openzfs/include/zfs_valstr.h           |   1 +
 sys/contrib/openzfs/lib/libspl/include/Makefile.am |   2 +
 .../{libzpool => libspl}/include/sys/abd_impl_os.h |   0
 .../lib/{libzpool => libspl}/include/sys/abd_os.h  |   0
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          |   7 +
 sys/contrib/openzfs/lib/libzpool/Makefile.am       |   2 -
 .../openzfs/lib/libzpool/include/Makefile.am       |   4 -
 sys/contrib/openzfs/man/man4/zfs.4                 |  18 +-
 sys/contrib/openzfs/man/man8/zpool-events.8        |  59 ++++-
 .../openzfs/module/os/linux/zfs/vdev_disk.c        | 281 +--------------------
 sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c  |   6 +-
 sys/contrib/openzfs/module/zcommon/zfs_valstr.c    |  11 +
 sys/contrib/openzfs/module/zfs/spa.c               |   6 +
 sys/contrib/openzfs/module/zfs/vdev.c              |   5 +-
 sys/contrib/openzfs/module/zfs/zfs_fm.c            |   2 +
 sys/contrib/openzfs/module/zfs/zfs_vnops.c         |   2 +-
 sys/contrib/openzfs/module/zfs/zio.c               |  52 ++--
 sys/contrib/openzfs/module/zfs/zvol.c              |   6 +-
 sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c |   1 +
 .../openzfs/tests/zfs-tests/include/tunables.cfg   |   2 +-
 .../functional/direct/dio_async_fio_ioengines.ksh  |  25 +-
 .../zfs-tests/tests/functional/io/io_uring.ksh     |   7 -
 32 files changed, 156 insertions(+), 400 deletions(-)