]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 603f1c3) | patch
zfs: merge OpenZFS master-bedbc13da
authorMartin Matuska <mm@FreeBSD.org>
Wed, 3 Mar 2021 01:15:33 +0000 (02:15 +0100)
committerMartin Matuska <mm@FreeBSD.org>
Wed, 10 Mar 2021 01:58:07 +0000 (02:58 +0100)
commitf2d3322c451180acca945aae2a5f1e334c7edd1d
tree9b1761a0afd6a860d938a973ab4a55a3dfcb4d12tree | snapshot
parent603f1c3da48c938c4e556760b771fc1a29635b7dcommit | diff
zfs: merge OpenZFS master-bedbc13da

Notable upstream commits:
  8e43fa12c Fix vdev_rebuild_thread deadlock
  03ef8f09e Add missing checks for unsupported features
  2e160dee9 Fix assert in FreeBSD-specific dmu_read_pages
  bedbc13da Cancel TRIM / initialize on FAULTED non-writeable vdevs

Obtained from: OpenZFS

(cherry picked from commit caed7b1c399de04279822028e15b36367e84232f)
23 files changed:
sys/contrib/openzfs/cmd/vdev_id/vdev_id diff | blob | history
sys/contrib/openzfs/cmd/zpool/Makefile.am diff | blob | history
sys/contrib/openzfs/config/kernel-bio.m4 diff | blob | history
sys/contrib/openzfs/config/kernel-generic_io_acct.m4 diff | blob | history
sys/contrib/openzfs/configure.ac diff | blob | history
sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h diff | blob | history
sys/contrib/openzfs/include/sys/dsl_synctask.h diff | blob | history
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c diff | blob | history
sys/contrib/openzfs/man/man5/zfs-module-parameters.5 diff | blob | history
sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c diff | blob | history
sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c diff | blob | history
sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c diff | blob | history
sys/contrib/openzfs/module/zfs/spa_misc.c diff | blob | history
sys/contrib/openzfs/module/zfs/zfs_ioctl.c diff | blob | history
sys/contrib/openzfs/tests/runfiles/common.run diff | blob | history
sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am diff | blob | history
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/.gitignore [new file with mode: 0644] blob
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/Makefile.am [new file with mode: 0644] blob
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/send_doall.c [new file with mode: 0644] blob
sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg diff | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh diff | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/Makefile.am diff | blob | history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_doall.ksh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.