CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

projects / FreeBSD / FreeBSD.git / commit

author	Martin Matuska <mm@FreeBSD.org>
	Wed, 3 Mar 2021 01:15:33 +0000 (02:15 +0100)
committer	Martin Matuska <mm@FreeBSD.org>
	Wed, 3 Mar 2021 01:15:33 +0000 (02:15 +0100)
commit	caed7b1c399de04279822028e15b36367e84232f
tree	11a8e01977837b40590b640f9bb404a5aca4ee85	tree \| snapshot
parent	df3747c6607be12d48db825653e6adfc3041e97f	commit \| diff
parent	154ce66101db0e1a9c90a94e391612b2ab8c048f	commit \| 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

MFC after: 1 week
Obtained from: OpenZFS

31 files changed:

sys/contrib/openzfs/cmd/vdev_id/vdev_id	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zpool/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/config/kernel-bio.m4	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/config/kernel-generic_io_acct.m4	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/configure.ac	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/include/sys/dsl_synctask.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man5/zfs-module-parameters.5	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/spa_misc.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/vdev_initialize.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/vdev_rebuild.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/vdev_trim.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/zfs_ioctl.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/runfiles/common.run	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/.gitignore	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/Makefile.am	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/send_doall.c	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_fault_export_import_online.ksh	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_doall.ksh	\|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

sys/contrib/openzfs/cmd/vdev_id/vdev_id	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/cmd/zpool/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/config/kernel-bio.m4	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/config/kernel-generic_io_acct.m4	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/configure.ac	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/include/sys/dsl_synctask.h	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/man/man5/zfs-module-parameters.5	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/spa_misc.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/vdev_initialize.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/vdev_rebuild.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/vdev_trim.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/module/zfs/zfs_ioctl.c	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/runfiles/common.run	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/.gitignore	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/Makefile.am	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/send_doall.c	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_fault_export_import_online.ksh	\|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/Makefile.am	diff1 \|	diff2 \|	blob \| history
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_doall.ksh	\|	diff2 \|	blob \| history