Diffusion FreeBSD src repository abcdc1b9aed7

zfs: merge openzfs/zfs@2e2a46e0a
abcdc1b9aed7
Actions

Description

zfs: merge openzfs/zfs@2e2a46e0a

Notable upstream pull request merges:
#15243 b53077a9e Add zfs_prepare_disk script for disk firmware install
#15298 2e2a46e0a Invoke zdb by guid to avoid import errors
#15301 e5d70f467 ZIL: Avoid dbuf_read() in ztest_get_data()

Obtained from: OpenZFS
OpenZFS commit: 2e2a46e0a597b3ee606ea7dc5bc527459077322f

Details

Provenance

mm	Authored on Sep 24 2023, 9:32 PM

Parents

rG0a5d2802b41f: vge: correct pause_frames sysctl description
rG2e2a46e0a597: Invoke zdb by guid to avoid import errors

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGabcdc1b9aed7: zfs: merge openzfs/zfs@2e2a46e0a (authored by mm).Sep 24 2023, 9:58 PM

Merged Changes

2e2a46e0a597 Invoke zdb by guid to avoid import errors
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
e5d70f4677af ZIL: Avoid dbuf_read() in ztest_get_data()
Author
mav
Browse Repository
No Builds
No Audits
7ac56b86cd69 Linux 6.6 compat: fsync_bdev() has been removed in favor of sync_blockdev()
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
01d00dfa9e47 Linux 6.6 compat: generic_fillattr has a new u32 request_mask added at arg2
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
b37f29341b9a Linux 6.6 compat: use inode_get/set_ctime*(...)
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
2dc89b922bd1 tests/block_cloning: try harder to stay on same txg in fallback test
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
b53077a9e751 Add zfs_prepare_disk script for disk firmware install
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits

Changes (36)

Path

Size

cddl/

lib/

libzfs/

usr.libexec/

sys/

contrib/

openzfs/

cmd/

zed/

agents/

zpool/

config/

kernel-generic_fillattr.m4

kernel-inode-times.m4

kernel.m4

contrib/

debian/

openzfs-zfsutils.install

include/

libzfs.h

os/

linux/

kernel/

linux/

vfs_compat.h

zfs/

sys/

zfs_vnops_os.h

zpl.h

lib/

libzfs/

man/

man8/

zfs_prepare_disk.8.in

module/

os/

linux/

zfs/

scripts/

tests/

zfs-tests/

tests/

functional/

block_cloning/

block_cloning_copyfilerange_fallback_same_txg.ksh

modules/

zfs/

zfs_config.h

zfs_gitrev.h

rGabcdc1b9aed7

View Options

cddl/lib/libzfs/Makefile

View Options

cddl/usr.libexec/Makefile

View Options

cddl/usr.libexec/zfs_prepare_disk/Makefile

View Options

sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c

View Options

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

View Options

sys/contrib/openzfs/cmd/zpool/zpool_util.h

View Options

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

View Options

sys/contrib/openzfs/cmd/ztest.c

View Options

sys/contrib/openzfs/config/Rules.am

View Options

sys/contrib/openzfs/config/kernel-fsync-bdev.m4

View Options

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

View Options

sys/contrib/openzfs/config/kernel-inode-times.m4

View Options

sys/contrib/openzfs/config/kernel.m4

View Options

sys/contrib/openzfs/contrib/debian/openzfs-zfsutils.install

View Options

sys/contrib/openzfs/include/libzfs.h

View Options

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

View Options

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

View Options

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

View Options

sys/contrib/openzfs/lib/libzfs/libzfs.abi

View Options

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

View Options

sys/contrib/openzfs/man/Makefile.am

View Options

sys/contrib/openzfs/man/man8/.gitignore

View Options

sys/contrib/openzfs/man/man8/zfs_prepare_disk.8.in

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

sys/contrib/openzfs/scripts/Makefile.am

View Options

sys/contrib/openzfs/scripts/zfs_prepare_disk

View Options

sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh

View Options

sys/modules/zfs/zfs_config.h

View Options

sys/modules/zfs/zfs_gitrev.h

zfs: merge openzfs/zfs@2e2a46e0aabcdc1b9aed7Actions

Description

Details

Event Timeline

Merged Changes

Changes (36)

rGabcdc1b9aed7

cddl/lib/libzfs/Makefile

cddl/usr.libexec/Makefile

cddl/usr.libexec/zfs_prepare_disk/Makefile

sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c

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

sys/contrib/openzfs/cmd/zpool/zpool_util.h

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

sys/contrib/openzfs/cmd/ztest.c

sys/contrib/openzfs/config/Rules.am

sys/contrib/openzfs/config/kernel-fsync-bdev.m4

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

sys/contrib/openzfs/config/kernel-inode-times.m4

sys/contrib/openzfs/config/kernel.m4

sys/contrib/openzfs/contrib/debian/openzfs-zfsutils.install

sys/contrib/openzfs/include/libzfs.h

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

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

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

sys/contrib/openzfs/lib/libzfs/libzfs.abi

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

sys/contrib/openzfs/man/Makefile.am

sys/contrib/openzfs/man/man8/.gitignore

sys/contrib/openzfs/man/man8/zfs_prepare_disk.8.in

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

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

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

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

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

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

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

sys/contrib/openzfs/scripts/Makefile.am

sys/contrib/openzfs/scripts/zfs_prepare_disk

sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange_fallback_same_txg.ksh

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h

zfs: merge openzfs/zfs@2e2a46e0a
abcdc1b9aed7
Actions