]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
zfs: merge openzfs/zfs@07a4c76e9 (master) into main
authorMartin Matuska <mm@FreeBSD.org>
Mon, 12 Jul 2021 21:23:38 +0000 (23:23 +0200)
committerMartin Matuska <mm@FreeBSD.org>
Mon, 12 Jul 2021 21:24:45 +0000 (23:24 +0200)
commit5eb61f6c6549f134a4f3bed4c164345d4f616bad
tree0ebfb9869a1ad0e906ea44630777b52d3db2af1f
parentdc5a0d6d6d0c4ad88d032762f036876fb64eb0d5
parent07a4c76e9016fad22f1ce2613ab5abc4b2652114
zfs: merge openzfs/zfs@07a4c76e9 (master) into main

Notable upstream pull request merges:
  #12299 file reference counts can get corrupted
  #12320 FreeBSD: Use unmapped I/O for scattered/gang ABD buffers

Obtained from: OpenZFS
OpenZFS commit: 07a4c76e9016fad22f1ce2613ab5abc4b2652114
16 files changed:
sys/contrib/openzfs/.github/ISSUE_TEMPLATE/bug_report.md
sys/contrib/openzfs/include/sys/dbuf.h
sys/contrib/openzfs/include/sys/dnode.h
sys/contrib/openzfs/include/sys/fm/util.h
sys/contrib/openzfs/include/sys/zfs_file.h
sys/contrib/openzfs/include/sys/zfs_ioctl.h
sys/contrib/openzfs/include/sys/zfs_onexit.h
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c
sys/contrib/openzfs/lib/libzpool/kernel.c
sys/contrib/openzfs/module/os/freebsd/zfs/vdev_geom.c
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_file_os.c
sys/contrib/openzfs/module/os/linux/zfs/zfs_file_os.c
sys/contrib/openzfs/module/zfs/fm.c
sys/contrib/openzfs/module/zfs/zfs_ioctl.c
sys/contrib/openzfs/module/zfs/zfs_onexit.c
sys/modules/zfs/zfs_config.h