Diffusion FreeBSD src repository 53b70c86d93c

zfs: merge openzfs/zfs@4a1195ca5 (master) into main
53b70c86d93c
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge openzfs/zfs@4a1195ca5 (master) into main

Notable upstream pull request merges:

#11312 Temporarily use root credentials to mount snapshots in .zfs
#12246 arc: Drop an incorrect assert
#12443 Fixed data integrity issue when underlying disk returns error
       to zfs
#12522 Compressed receive with different ashift can result in incorrect
       PSIZE on disk
#12535 Verify embedded blkptr's in arc_read()
#12541 Allow sending corrupt snapshots even if metadata is corrupted

Obtained from: OpenZFS
OpenZFS commit: 4a1195ca5041cbff2a6b025a31937fef84876c52

Details

Provenance

mm	Authored on Sep 15 2021, 3:30 PM

Parents

rG6e8272f317b8: mount: improve error message for invalid filesystem names
rG4a1195ca5041: Temporarily use root credentials to mount snapshots in .zfs

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG53b70c86d93c: zfs: merge openzfs/zfs@4a1195ca5 (master) into main (authored by mm).Sep 15 2021, 3:30 PM

Merged Changes

4a1195ca5041 Temporarily use root credentials to mount snapshots in .zfs
Author
allanjude
Browse Repository
No Builds
No Audits
6954c22f35cc Use fallthrough macro
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
7443299fe0b8 Iterate encrypted clones at zvol_create_minor
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits
f82f0279ed58 Fixed data integrity issue when underlying disk returns error
Author
Arun KV <65647132+arun-kv@users.noreply.github.com>
Browse Repository
No Builds
No Audits
695d4ae81551 ZTS: Waiting for zvols to be available
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
b9ec4a15e5ab Verify embedded blkptr's in arc_read()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
5a54a4e05179 Upstream: Add snapshot and zvol events
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits
2079111f42a9 Linux 5.15 compat: get_acl()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
a68e4b5919dc Allow sending corrupt snapshots even if metadata is corrupted
Author
allanjude
Browse Repository
No Builds
No Audits
7676ffc51f5e arc: Drop an incorrect assert
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
49d8a99a4d65 Upstream: zdb inode mapping
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits
c634320e51df Compressed receive with different ashift can result in incorrect PSIZE on disk
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
a3588c68f702 Linux 5.15 compat: standalone <linux/stdarg.h>
Author
Alexander <solbjorn@users.noreply.github.com>
Browse Repository
No Builds
No Audits
f61660582197 Linux 5.15 compat: block device readahead
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
ab15b1fc0e71 Detect iSCSI in the zpool cmd vdev media script
Author
Don Brady <don.brady@delphix.com>
Browse Repository
No Builds
No Audits
3eb3e4d14cf0 CI: don't install abigail-tools
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
6ea058da16cc Update ABI files via new libabigail version
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
1aaebea2f587 Libabigail: make .abi files more consistent
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
d510924520dd CI: use fresh libabigail via docker image
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
a9655fc2bd1f Check for libabigail version
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
157a4d05bd73 autoconf: allow Release to contain hyphen
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits
c27c124a88b2 ZTS: Remove exceptions for flaky zhack on FreeBSD
Author
freqlabs
Browse Repository
No Builds
No Audits
3e8d5e4ff3a6 Add zpool_disable_datasets_os() / zfs_unmount_os()
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits

Changes (80)

Path

Size

sys/

contrib/

openzfs/

.github/

workflows/

checkstyle.yaml

cmd/

mount_zfs/

zdb/

zed/

agents/

zfs/

zpool/

zpool.d/

zpool_influxdb/

zpool_influxdb.c

config/

always-compiler-options.m4

kernel-blk-queue.m4

kernel-stdarg.m4

include/

os/

freebsd/

linux/

linux/

kernel/

linux/

blkdev_compat.h

compiler_compat.h

spl/

sys/

zfs/

sys/

zfs_context_os.h

sys/

fm/

fs/

lib/

libnvpair/

libspl/

include/

sys/

feature_tests.h

libuutil/

libzfs/

libzfs_dataset.c

libzfs_sendrecv.c

os/

freebsd/

libzfs_zmount.c

linux/

libzfs_mount_os.c

libzfs_core/

libzfs_core.abi

libzfsbootenv/

libzfsbootenv.abi

libzutil/

module/

icp/

core/

kcf_prov_tabs.c

io/

lua/

os/

freebsd/

spl/

zfs/

linux/

zfs/

zfs/

vdev_raidz_math_scalar.c

tests/

test-runner/

bin/

zts-report.py.in

zfs-tests/

cmd/

mkbusy/

tests/

functional/

cli_root/

zfs_copies/

zfs_copies.kshlib

zfs_rename/

zfs_rename_006_pos.ksh

zpool_import/

zpool_import_errata3.ksh

zvol/

zvol_misc/

zvol_misc_volmode.ksh

modules/

zfs/

rG53b70c86d93c

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

Loading...

sys/contrib/openzfs/Makefile.am

Loading...

sys/contrib/openzfs/cmd/mount_zfs/mount_zfs.c

Loading...

sys/contrib/openzfs/cmd/zdb/zdb.c

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/cmd/zed/zed_conf.c

Loading...

sys/contrib/openzfs/cmd/zed/zed_exec.c

Loading...

sys/contrib/openzfs/cmd/zfs/zfs_main.c

Loading...

sys/contrib/openzfs/cmd/zpool/zpool.d/media

Loading...

sys/contrib/openzfs/cmd/zpool_influxdb/zpool_influxdb.c

Loading...

sys/contrib/openzfs/config/Abigail.am

Loading...

sys/contrib/openzfs/config/Rules.am

Loading...

sys/contrib/openzfs/config/always-compiler-options.m4

Loading...

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

Loading...

sys/contrib/openzfs/config/kernel-blk-queue.m4

Loading...

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

Loading...

sys/contrib/openzfs/config/kernel.m4

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/include/libzfs.h

Loading...

sys/contrib/openzfs/include/os/freebsd/linux/compiler.h

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/include/sys/fm/fs/zfs.h

Loading...

sys/contrib/openzfs/include/sys/spa.h

Loading...

sys/contrib/openzfs/include/sys/zfs_context.h

Loading...

sys/contrib/openzfs/include/sys/zio.h

Loading...

sys/contrib/openzfs/lib/libnvpair/libnvpair.abi

Loading...

sys/contrib/openzfs/lib/libspl/include/sys/feature_tests.h

Loading...

sys/contrib/openzfs/lib/libuutil/libuutil.abi

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/lib/libzfs/libzfs_util.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/libzfs_core/libzfs_core.abi

Loading...

sys/contrib/openzfs/lib/libzfsbootenv/libzfsbootenv.abi

Loading...

sys/contrib/openzfs/lib/libzfsbootenv/lzbe_device.c

Loading...

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

Loading...

sys/contrib/openzfs/module/icp/core/kcf_prov_tabs.c

Loading...

sys/contrib/openzfs/module/icp/io/aes.c

Loading...

sys/contrib/openzfs/module/lua/lcode.c

Loading...

sys/contrib/openzfs/module/lua/lgc.c

Loading...

sys/contrib/openzfs/module/lua/llex.c

Loading...

sys/contrib/openzfs/module/lua/lstrlib.c

Loading...

sys/contrib/openzfs/module/lua/ltable.c

Loading...

sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_006_pos.ksh

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_volmode.ksh

Loading...

sys/modules/zfs/zfs_config.h

Loading...

sys/modules/zfs/zfs_gitrev.h

Loading...