Diffusion FreeBSD src repository caed7b1c399d

zfs: merge OpenZFS master-bedbc13da
caed7b1c399d
Actions

Description

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

Details

Provenance

mm	Authored on Mar 3 2021, 1:15 AM

Parents

rG154ce66101db: Update vendor/openzfs to master-bedbc13da
rGdf3747c6607b: Replace STAILQ_SWAP() with simpler STAILQ_CONCAT().

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGcaed7b1c399d: zfs: merge OpenZFS master-bedbc13da (authored by mm).Mar 3 2021, 1:15 AM

mm mentioned this in rG6781b8a32e70: zfs: update openzfs version reference to bedbc13da.Mar 5 2021, 2:57 PM

mm mentioned this in rGf2d3322c4511: zfs: merge OpenZFS master-bedbc13da.Mar 10 2021, 9:38 AM

Merged Changes

154ce66101db Update vendor/openzfs to master-bedbc13da
Author
mm
Browse Repository
No Builds
No Audits

Changes (32)

Path

Size

sys/

contrib/

openzfs/

cmd/

vdev_id/

vdev_id

zpool/

Makefile.am

config/

kernel-bio.m4

kernel-generic_io_acct.m4

configure.ac

include/

os/

linux/

kernel/

linux/

blkdev_compat.h

sys/

dsl_synctask.h

lib/

libzfs/

libzfs_sendrecv.c

man/

man5/

zfs-module-parameters.5

module/

os/

freebsd/

zfs/

dmu_os.c

linux/

zfs/

zfs/

tests/

runfiles/

common.run

zfs-tests/

cmd/

include/

tests/

functional/

cli_root/

zpool_initialize/

Makefile.am

zpool_initialize_fault_export_import_online.ksh

zpool_trim/

Makefile.am

zpool_trim_fault_export_import_online.ksh

zpool_trim_start_and_cancel_pos.ksh

rsend/

Makefile.am

send_doall.ksh

rGcaed7b1c399d

View Options

sys/contrib/openzfs/cmd/vdev_id/vdev_id

View Options

sys/contrib/openzfs/cmd/zpool/Makefile.am

View Options

sys/contrib/openzfs/config/kernel-bio.m4

View Options

sys/contrib/openzfs/config/kernel-generic_io_acct.m4

View Options

sys/contrib/openzfs/configure.ac

View Options

sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h

View Options

sys/contrib/openzfs/include/sys/dsl_synctask.h

View Options

sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c

View Options

sys/contrib/openzfs/man/man5/zfs-module-parameters.5

View Options

sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c

View Options

sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c

View Options

sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c

View Options

sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c

View Options

sys/contrib/openzfs/module/zfs/spa_misc.c

View Options

sys/contrib/openzfs/module/zfs/vdev_initialize.c

View Options

sys/contrib/openzfs/module/zfs/vdev_rebuild.c

View Options

sys/contrib/openzfs/module/zfs/vdev_trim.c

View Options

sys/contrib/openzfs/module/zfs/zfs_ioctl.c

View Options

sys/contrib/openzfs/tests/runfiles/common.run

View Options

sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am

View Options

sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/.gitignore

View Options

sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/Makefile.am

View Options

sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/send_doall.c

View Options

sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_fault_export_import_online.ksh

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/Makefile.am

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_doall.ksh

zfs: merge OpenZFS master-bedbc13dacaed7b1c399dActions

Description

Details

Event Timeline

Merged Changes

Changes (32)

rGcaed7b1c399d

sys/contrib/openzfs/cmd/vdev_id/vdev_id

sys/contrib/openzfs/cmd/zpool/Makefile.am

sys/contrib/openzfs/config/kernel-bio.m4

sys/contrib/openzfs/config/kernel-generic_io_acct.m4

sys/contrib/openzfs/configure.ac

sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h

sys/contrib/openzfs/include/sys/dsl_synctask.h

sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c

sys/contrib/openzfs/man/man5/zfs-module-parameters.5

sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c

sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_ioctl_os.c

sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c

sys/contrib/openzfs/module/zfs/spa_misc.c

sys/contrib/openzfs/module/zfs/vdev_initialize.c

sys/contrib/openzfs/module/zfs/vdev_rebuild.c

sys/contrib/openzfs/module/zfs/vdev_trim.c

sys/contrib/openzfs/module/zfs/zfs_ioctl.c

sys/contrib/openzfs/tests/runfiles/common.run

sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/.gitignore

sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/cmd/send_doall/send_doall.c

sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_fault_export_import_online.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_doall.ksh

zfs: merge OpenZFS master-bedbc13da
caed7b1c399d
Actions