Diffusion FreeBSD src repository cf2a72643460

zfs: merge OpenZFS master-9305ff2ed
cf2a72643460
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge OpenZFS master-9305ff2ed

Notable upstream pull request merges:

#11153 Scalable teardown lock for FreeBSD
#11651 Don't bomb out when using keylocation=file://
#11667 zvol: call zil_replaying() during replay
#11683 abd_get_offset_struct() may allocate new abd
#11693 Intentionally allow ZFS_READONLY in zfs_write
#11716 zpool import cachefile improvements
#11720 FreeBSD: Clean up zfsdev_close to match Linux
#11730 FreeBSD: bring back possibility to rewind the
       checkpoint from bootloader

Obtained from: OpenZFS

(cherry picked from commit 9db44a8e5da9bf1ce6dd1c0f1468ddafed6d6c91)

Details

Provenance

mm	Authored on Mar 14 2021, 1:23 AM

Parents

rG1260724822b5: Fix `netstat -rs` reporting.

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGcf2a72643460: zfs: merge OpenZFS master-9305ff2ed (authored by mm).Apr 4 2021, 1:18 PM

Changes (44)

Path

Size

sys/

contrib/

openzfs/

.github/

workflows/

checkstyle.yaml

cmd/

vdev_id/

zpool/

zstream/

zstream_redup.c

config/

include/

os/

freebsd/

spl/

sys/

zfs/

sys/

zfs_vfsops_os.h

linux/

spl/

sys/

zfs/

sys/

zfs_vfsops_os.h

zfs_znode_impl.h

sys/

lib/

libzfs/

libzfs_crypto.c

os/

freebsd/

libzfs_zmount.c

linux/

libzfs_mount_os.c

libzutil/

man/

man8/

module/

os/

freebsd/

zfs/

linux/

zfs/

zcommon/

zfs/

tests/

runfiles/

zfs-tests/

include/

tests/

functional/

cli_root/

zpool/

zpool_002_pos.ksh

zpool_003_pos.ksh

zpool_import/

import_cachefile_paths_changed.ksh

events/

events_002_pos.ksh

xattr/

xattr_003_neg.ksh

modules/

zfs/

rGcf2a72643460

sys/contrib/openzfs/.github/workflows/checkstyle.yaml

Loading...

sys/contrib/openzfs/cmd/vdev_id/vdev_id

Loading...

sys/contrib/openzfs/cmd/zpool/zpool_main.c

Loading...

sys/contrib/openzfs/cmd/zstream/zstream_redup.c

Loading...

sys/contrib/openzfs/config/zfs-build.m4

Loading...

sys/contrib/openzfs/configure.ac

Loading...

sys/contrib/openzfs/include/os/freebsd/spl/sys/Makefile.am

Loading...

sys/contrib/openzfs/include/os/freebsd/spl/sys/debug.h

Loading...

sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h

Loading...

sys/contrib/openzfs/include/os/linux/spl/sys/debug.h

Loading...

sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vfsops_os.h

Loading...

sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_znode_impl.h

Loading...

sys/contrib/openzfs/include/sys/dmu_redact.h

Loading...

sys/contrib/openzfs/include/sys/zfs_ioctl.h

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c

Loading...

sys/contrib/openzfs/lib/libzfs/os/linux/libzfs_mount_os.c

Loading...

sys/contrib/openzfs/lib/libzutil/zutil_import.c

Loading...

sys/contrib/openzfs/man/man8/zfs-receive.8

Loading...

sys/contrib/openzfs/man/man8/zfs-send.8

Loading...

sys/contrib/openzfs/module/Makefile.in

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/module/zcommon/zfs_prop.c

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/include/libtest.shlib

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_paths_changed.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/events_002_pos.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_003_neg.ksh

Loading...

sys/modules/zfs/zfs_config.h

Loading...